freeswitch: move to packages-abandoned repository
authorJiri Slachta <jiri@slachta.eu>
Sun, 16 Jun 2019 10:53:51 +0000 (12:53 +0200)
committerJiri Slachta <jiri@slachta.eu>
Sun, 16 Jun 2019 11:22:44 +0000 (13:22 +0200)
Signed-off-by: Jiri Slachta <jiri@slachta.eu>
48 files changed:
net/freeswitch/Config.in [deleted file]
net/freeswitch/Makefile [deleted file]
net/freeswitch/files/freeswitch.config [deleted file]
net/freeswitch/files/freeswitch.default [deleted file]
net/freeswitch/files/freeswitch.hotplug [deleted file]
net/freeswitch/files/freeswitch.init [deleted file]
net/freeswitch/patches/glibc/Makefile_am.patch [deleted file]
net/freeswitch/patches/glibc/build-config-erlang_m4.patch [deleted file]
net/freeswitch/patches/glibc/build-modules_conf_in.patch [deleted file]
net/freeswitch/patches/glibc/build-openwrt_rules.mk.patch [deleted file]
net/freeswitch/patches/glibc/configure_ac.patch [deleted file]
net/freeswitch/patches/glibc/libs-apr-configure_ac.patch [deleted file]
net/freeswitch/patches/glibc/libs-apr-util-configure_gnu.patch [deleted file]
net/freeswitch/patches/glibc/libs-srtp-configure_ac.patch [deleted file]
net/freeswitch/patches/glibc/src-mod-applications-mod_http_cache-conf-autoload_configs-http_cache_conf_xml.patch [deleted file]
net/freeswitch/patches/glibc/src-mod-endpoints-mod_sofia-conf-sofia_conf_xml.patch [deleted file]
net/freeswitch/patches/glibc/src-mod-endpoints-mod_verto-Makefile_am.patch [deleted file]
net/freeswitch/patches/glibc/src-mod-languages-mod_perl-Makefile_am.patch [deleted file]
net/freeswitch/patches/glibc/src-mod-languages-mod_python-Makefile_am.patch [deleted file]
net/freeswitch/patches/glibc/src-mod-languages-mod_python-freeswitch_python_cpp.patch [deleted file]
net/freeswitch/patches/musl/Makefile_am.patch [deleted file]
net/freeswitch/patches/musl/build-config-erlang_m4.patch [deleted file]
net/freeswitch/patches/musl/build-modules_conf_in.patch [deleted file]
net/freeswitch/patches/musl/build-openwrt_rules.mk.patch [deleted file]
net/freeswitch/patches/musl/configure_ac.patch [deleted file]
net/freeswitch/patches/musl/libs-apr-configure_ac.patch [deleted file]
net/freeswitch/patches/musl/libs-apr-util-configure_gnu.patch [deleted file]
net/freeswitch/patches/musl/libs-srtp-configure_ac.patch [deleted file]
net/freeswitch/patches/musl/src-mod-applications-mod_http_cache-conf-autoload_configs-http_cache_conf_xml.patch [deleted file]
net/freeswitch/patches/musl/src-mod-endpoints-mod_sofia-conf-sofia_conf_xml.patch [deleted file]
net/freeswitch/patches/musl/src-mod-endpoints-mod_verto-Makefile_am.patch [deleted file]
net/freeswitch/patches/musl/src-mod-languages-mod_perl-Makefile_am.patch [deleted file]
net/freeswitch/patches/musl/src-mod-languages-mod_python-Makefile_am.patch [deleted file]
net/freeswitch/patches/musl/src-mod-languages-mod_python-freeswitch_python_cpp.patch [deleted file]
net/freeswitch/patches/uClibc/Makefile_am.patch [deleted file]
net/freeswitch/patches/uClibc/build-config-erlang_m4.patch [deleted file]
net/freeswitch/patches/uClibc/build-modules_conf_in.patch [deleted file]
net/freeswitch/patches/uClibc/build-openwrt_rules.mk.patch [deleted file]
net/freeswitch/patches/uClibc/configure_ac.patch [deleted file]
net/freeswitch/patches/uClibc/libs-apr-configure_ac.patch [deleted file]
net/freeswitch/patches/uClibc/libs-apr-util-configure_gnu.patch [deleted file]
net/freeswitch/patches/uClibc/libs-srtp-configure_ac.patch [deleted file]
net/freeswitch/patches/uClibc/src-mod-applications-mod_http_cache-conf-autoload_configs-http_cache_conf_xml.patch [deleted file]
net/freeswitch/patches/uClibc/src-mod-endpoints-mod_sofia-conf-sofia_conf_xml.patch [deleted file]
net/freeswitch/patches/uClibc/src-mod-endpoints-mod_verto-Makefile_am.patch [deleted file]
net/freeswitch/patches/uClibc/src-mod-languages-mod_perl-Makefile_am.patch [deleted file]
net/freeswitch/patches/uClibc/src-mod-languages-mod_python-Makefile_am.patch [deleted file]
net/freeswitch/patches/uClibc/src-mod-languages-mod_python-freeswitch_python_cpp.patch [deleted file]

diff --git a/net/freeswitch/Config.in b/net/freeswitch/Config.in
deleted file mode 100644 (file)
index 958be57..0000000
+++ /dev/null
@@ -1,264 +0,0 @@
-menu "Configuration"
-  depends on PACKAGE_freeswitch
-
-  choice
-    depends on DEVEL
-    prompt "Git HEAD version to use"
-    default FS_WITH_DEFAULT_HEAD
-    help
-       The existing git HEAD is probably outdated. This option allows
-       OpenWRT to pull the latest git HEAD. Please ONLY enable this
-       option if you know what you are doing. It may and/or may not
-       be cleanly compiled and may require some intervension to create
-       new patches. If you take this route and come up with some patches,
-       please contemplate to contribute
-       or send in your patches.
-
-    config FS_WITH_DEFAULT_HEAD
-      bool "Default"
-      help
-       Since developers @FreeSWITCH are actively working to improve
-       FreeSWITCH, there is a chance the default git HEAD has long
-       been oudated.
-
-    config FS_WITH_LATEST_HEAD
-      bool "Latest"
-      help
-       Please use this option with cautious. It may and/or may not compile
-       out of the box and may and/or may not require some additional new
-       patches.
-
-  endchoice
-
-  choice
-    prompt "FS TARRED archive to use"
-    default FS_WITH_OPENWRT_SOURCE
-    help
-       Select which tarred to use: local or OpenWRT
-       local: Manually downloaded from FS git repo
-       OpenWRT: FS tarred-file downloaded from source by OpenWRT
-       FS git repo: https://freeswitch.org/stash/scm/fs/freeswitch.git
-
-   config FS_WITH_LOCAL_SOURCE
-      bool "local"
-      help
-       Use local tarred archive. This approach requires a manually checkout
-       source from FS git repository using 'git clone', then package the
-       source using tar with XZ compression. The tarred file should include
-       $(PKG_VERSION) as follows:
-       1. "git clone git://git.freeswitch.org/freeswitch.git <dir>"
-       2. Change to <dir>.
-       3. "git checkout $(FS_DEFAULT_HEAD) && git submodule update"
-       4. Back to parent <dir>.
-       5. "tar -Jcf freeswitch_git-$(PKG_VERSION).tar.xz <dir>"
-       6. Move the tarred file to OpenWRT download directory.
-
-   config FS_WITH_OPENWRT_SOURCE
-      bool "OpenWRT"
-      help
-       Use (download) tarred archive from OpenWRT.
-
-  endchoice
-
-  choice 
-    prompt "Select database"
-    default FS_WITH_SQLITE3
-    help
-       Select which database library to use for libs/apr-util package.
-       Default is SQLite.
-
-    config FS_WITH_MYSQL
-      bool "MySQL"
-      help
-       Compile libs/apr-util with MySQL support.
-
-    config FS_WITH_POSTGRESQL
-      bool "PostgreSQL"
-      help
-       Compile libs/apr-util with PostgreSQL support.
-
-    config FS_WITH_SQLITE3
-      bool "SQLITE3"
-      help
-       Compile libs/apr-util with SQLITE3 support.
-
-  endchoice
-
-  config FS_WITH_ALSA
-    bool "Enable ALSA for sound support"
-    default y
-    help
-       Compile with ALSA support.
-
-  config FS_WITH_VISIBILITY
-    bool "Enable API visibility support"
-    default y
-    help
-       Compile with API visibility support.
-
-  config FS_WITH_APR_CONFIG_SWITCHES
-    bool "Enable APR configuration switches"
-    default y
-    help
-       Enable some configure switches in libs/apr.
-
-  config FS_WITH_APR_IPV6
-    depends on FS_WITH_APR_CONFIG_SWITCHES
-    bool "Enable IPV6 support in APR"
-    default y
-    help
-       Compile libs/apr package with IPV6 support.
-
-  config FS_WITH_APR_SCTP
-    depends on FS_WITH_APR_CONFIG_SWITCHES
-    bool "Enable SCTP support in APR"
-    default y
-    help
-       Compile with SCTP (Stream Control Transfer Protocol)
-       support in lib APR.
-
-  config FS_WITH_APR_THREADS
-    depends on FS_WITH_APR_CONFIG_SWITCHES
-    bool "Enable threading support in APR"
-    default y
-    help
-       Compile with threads support in libs/apr.
-
-  config FS_WITH_BUILTIN_ZRTP
-    bool "Enable built-in ZRTP"
-    default y
-    help
-       Compile with ZRTP support.
-
-  config FS_WITH_OGG
-    bool "Enable ogg support in mod_celt"
-    default y
-    help
-       Enable this option to allow use of OGG in mod_celt.
-
-  config FS_WITH_CORE_LIBEDIT_SUPPORT
-    bool "Compile with libedit Support"
-    default n
-    help
-       Compile with libedit Support. ATM, libedit isn't 
-       supported by OpenWRT.
-
-  config FS_WITH_FHS
-    bool "Follow the FHS when placing files and directories"
-    default y
-    help
-       Build FreeSWITCH to comply with FHS when placing 
-       files and directories.
-
-  config FS_WITH_LIBVPX
-    bool "Enable building libvpx"
-    default y
-    help
-       Compile to build libs/libvpx.
-
-  config FS_WITH_LIBYUV
-    bool "Enable building libyuv"
-    default y
-    help
-       Compile to build libs/libyuv.
-
-  config FS_WITH_LZMA
-    bool "Enable liblzma usage in libtiff"
-    default y
-    help
-       Compile libs/tiff package with liblzma support. This option
-       requires LZMA2 compression package called liblzma.
-
-  config FS_WITH_ODBC
-    depends on PACKAGE_sqliteodbc
-    depends on PACKAGE_unixodbc_svn
-    bool "Compile with ODBC support (Requires unixodbc NOT YET AVAILABLE)"
-    default n
-    help
-       Enable ODBC support. Since both sqliteodbc and unixodbc 
-       packages are not yet available on OpenWRT, ODBC support 
-       should not be enabled.
-
-  config FS_WITH_OPENSSL
-    bool "Enable SSL support"
-    default y
-    help
-       Compile with SSL support.
-
-  config FS_WITH_OPT
-    bool "Enable optimization"
-    default y
-    help
-       Compile with optimization flag enabled. This
-       will add max optimising compiler flags
-
-  config FS_WITH_SILENT_RULES
-    bool "Enable with less verbose build output"
-    default n
-    help
-       Enable this option to produce a less verbose build output
-       (undo: "make V=1")
-
-  config FS_WITH_SRTP
-    bool "Enable SRTP"
-    default y
-    help
-       Compile with SRTP support.
-
-  config FS_WITH_SRTP_GENERIC_AESICM
-    depends on FS_WITH_SRTP
-    bool "Compile in changes for ISMAcryp"
-    default y
-    help
-       Compile in changes for ISMAcryp.
-
-  config FS_WITH_SRTP_KERNEL_LINUX
-    depends on FS_WITH_SRTP
-    bool "Build library to run in Linux kernel context"
-    default n
-    help
-       Build library to run in Linux kernel context.
-
-  config FS_WITH_SRTP_OPENSSL
-    depends on FS_WITH_SRTP
-    bool "Use OpenSSL crypto primitives to build SRTP"
-    default y
-    help
-       Use OpenSSL crypto primitives.
-
-  config FS_WITH_STUN
-    bool "Enable stun module"
-    default y
-    help
-       Enable stun module.
-
-  config FS_WITH_ERLANG
-    depends on PACKAGE_freeswitch-mod-erlang-event
-    string
-    prompt "path to erlang installed directory"
-    default "$$(STAGING_DIR_HOSTPKG)/lib/erlang"
-    help
-       Specify the path to erlang libraries.
-
-#  config FS_WITH_OGG_INCLUDES
-#    string
-#    prompt "OGG include HEADER path"
-#    default "$$(STAGING_DIR)/usr/include"
-#    help
-#      Specify the include header path for OGG library.
-
-  config FS_WITH_PYTHON
-    bool "Enable to use system provided version of python"
-    default y
-    help
-       Enable to use system provided version of python.
-
-  config FS_WITH_PYTHON_PATH
-    depends on FS_WITH_PYTHON
-    string
-    prompt "full path to binary python$(PYTHON3_VERSION)"
-    default "$$(STAGING_DIR_HOSTPKG)/bin/python$(PYTHON3_VERSION)"
-    help
-        Specify the full path to binary python$(PYTHON3-VERSION).
-
-endmenu
diff --git a/net/freeswitch/Makefile b/net/freeswitch/Makefile
deleted file mode 100644 (file)
index bf4e17d..0000000
+++ /dev/null
@@ -1,1071 +0,0 @@
-#
-# Copyright (C) 2009-2016 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-#
-include $(TOPDIR)/rules.mk
-
-
-PKG_NAME:=freeswitch
-PKG_SOURCE_PROTO:=git
-PKG_DISTNAME:=$(PKG_NAME)_$(PKG_SOURCE_PROTO)
-PKG_VERSION:=1.9.0
-
-
-#
-# The latest FS git hash in PKG_SOURCE_VERSION can be obtained from
-# http://fisheye.freeswitch.org
-#
-PKG_SOURCE_URL:=https://$(PKG_NAME).org/stash/scm/fs/$(PKG_NAME).git
-PATCH_DIR:=./patches/$(CONFIG_LIBC)
-
-
-FS_WITH_DEFAULT_HEAD:=77d0cfbf9e9a546b4eee23d9668cf44022f5d454
-FS_WITH_DEFAULT_HEAD_SHORT:=$(shell echo $(FS_WITH_DEFAULT_HEAD)|cut -b -7)
-PKG_SOURCE_VERSION:=$(if $(CONFIG_FS_WITH_LATEST_HEAD),$(shell git ls-remote $(PKG_SOURCE_URL) HEAD | cut -f1),$(FS_WITH_DEFAULT_HEAD))
-PKG_SOURCE_VERSION_SHORT:=$(shell echo $(PKG_SOURCE_VERSION)|cut -b -7)
-PKG_RELEASE:=$(PKG_SOURCE_VERSION_SHORT)
-PKG_SOURCE:=$(PKG_DISTNAME)-$(FS_WITH_DEFAULT_HEAD_SHORT).tar.xz
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
-
-
-TAR_OPTIONS+= --strip-components=1 -C $(PKG_BUILD_DIR)
-
-
-PKG_BUILD_DEPENDS:=swig/host
-PKG_FIXUP:=autoreconf
-PKG_BUILD_PARALLEL:=0
-PKG_USE_MIPS16:=0
-
-
-PKG_LICENSE:=MPL-1.1
-PKG_LICENSE_FILES:=COPYING
-
-
-ifeq ($(CONFIG_DEVEL),y)
-       export QUILT=1
-endif
-
-
-FS_MOD_AVAILABLE:= \
-       abstraction \
-       alsa \
-       amr \
-       amrwb \
-       av \
-       avmd \
-       basic \
-       bert \
-       blacklist \
-       bv \
-       callcenter \
-       cdr-csv \
-       cdr-mongodb \
-       cdr-pg-csv \
-       cdr-sqlite \
-       cepstral \
-       cidlookup \
-       cluechoo \
-       codec2 \
-       commands \
-       conference \
-       console \
-       curl \
-       cv \
-       dahdi-codec \
-       db \
-       dialplan-asterisk \
-       dialplan-directory \
-       dialplan-xml \
-       dingaling \
-       directory \
-       distributor \
-       dptools \
-       easyroute \
-       enum \
-       erlang-event \
-       esf \
-       esl \
-       event-multicast \
-       event-socket \
-       event-zmq \
-       expr \
-       fifo \
-       file-string \
-       flite \
-       format-cdr \
-       freetdm \
-       fsk \
-       fsv \
-       g723-1 \
-       g729 \
-       graylog2 \
-       gsmopen \
-       h26x \
-       h323 \
-       hash \
-       hiredis \
-       html5 \
-       httapi \
-       http-cache \
-       ilbc \
-       isac \
-       java \
-       json-cdr \
-       kazoo \
-       lcr \
-       ldap \
-       local-stream \
-       logfile \
-       loopback \
-       lua \
-       managed \
-       memcache \
-       mongo \
-       mp4 \
-       mp4v \
-       native-file \
-       nibblebill \
-       opus \
-       oreka \
-       perl \
-       png \
-       portaudio \
-       portaudio-stream \
-       posix-timer \
-       prefix \
-       python \
-       radius-cdr \
-       rayo \
-       redis \
-       rss \
-       rtc \
-       rtmp \
-       sangoma-codec \
-       say-de \
-       say-en \
-       say-es \
-       say-fa \
-       say-fr \
-       say-hu \
-       say-it \
-       say-nl \
-       say-pt \
-       say-ru \
-       say-th \
-       say-zh \
-       shell-stream \
-       silk \
-       siren \
-       skel \
-       skinny \
-       skypopen \
-       smpp \
-       sms \
-       snapshot \
-       sndfile \
-       snmp \
-       snom \
-       sofia \
-       sonar \
-       spandsp \
-       spidermonkey \
-       spidermonkey-core-db \
-       spidermonkey-curl \
-       spidermonkey-odbc \
-       spidermonkey-socket \
-       spidermonkey-teletone \
-       spy \
-       ssml \
-       stress \
-       syslog \
-       timerfd \
-       tone-stream \
-       translate \
-       tts-commandline \
-       unimrcp \
-       valet-parking \
-       verto \
-       vmd \
-       voicemail \
-       voicemail-ivr \
-       xml-cdr \
-       xml-curl \
-       xml-ldap \
-       xml-radius \
-       xml-rpc \
-       xml-scgi \
-       yaml \
-
-
-PKG_CONFIG_DEPENDS:= \
-       CONFIG_FS_WITH_LATEST_HEAD \
-       CONFIG_FS_WITH_ALSA \
-       CONFIG_FS_WITH_APR_CONFIG_SWITCHES \
-       CONFIG_FS_WITH_APR_IPV6 \
-       CONFIG_FS_WITH_APR_SCTP \
-       CONFIG_FS_WITH_APR_THREADS \
-       CONFIG_FS_WITH_BUILTIN_ZRTP \
-       CONFIG_FS_WITH_CORE_LIBEDIT_SUPPORT \
-       CONFIG_FS_WITH_DEFAULT_HEAD \
-       CONFIG_FS_WITH_ERLANG \
-       CONFIG_FS_WITH_FHS \
-       CONFIG_FS_WITH_FIXED_POINT \
-       CONFIG_FS_WITH_LOCAL_SOURCE \
-       CONFIG_FS_WITH_LIBVPX \
-       CONFIG_FS_WITH_LIBYUV \
-       CONFIG_FS_WITH_LZMA \
-       CONFIG_FS_WITH_MYSQL \
-       CONFIG_FS_WITH_ODBC \
-       CONFIG_FS_WITH_OGG \
-       CONFIG_FS_WITH_OPENSSL \
-       CONFIG_FS_WITH_OPENWRT_SOURCE \
-       CONFIG_FS_WITH_OPT \
-       CONFIG_FS_WITH_POSTGRESQL \
-       CONFIG_FS_WITH_PYTHON \
-       CONFIG_FS_WITH_PYTHON_PATH \
-       CONFIG_FS_WITH_SILENT_RULES \
-       CONFIG_FS_WITH_SQLITE3 \
-       CONFIG_FS_WITH_SRTP \
-       CONFIG_FS_WITH_SRTP_GENERIC_AESICM \
-       CONFIG_FS_WITH_SRTP_KERNEL_LINUX \
-       CONFIG_FS_WITH_SRTP_OPENSSL \
-       CONFIG_FS_WITH_STUN \
-       CONFIG_FS_WITH_VISIBILITY \
-       $(patsubst %,CONFIG_PACKAGE_$(PKG_NAME)-mod-%,$(FS_MOD_AVAILABLE)) \
-
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-include $(TOPDIR)/feeds/packages/lang/perl/perlmod.mk
-
-
-ifneq ($(CONFIG_FS_WITH_PYTHON),)
-include $(TOPDIR)/feeds/packages/lang/python/python3-package.mk
-#$(call include_mk, python3-package.mk)
-endif
-
-
-ifneq ($(CONFIG_CCACHE),)
-TARGET_CC=$(TARGET_CC_NOCACHE)
-TARGET_CXX=$(TARGET_CXX_NOCACHE)
-endif
-
-
-define Package/$(PKG_NAME)/Default
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Telephony
-  URL:=http://www.$(PKG_NAME).org/
-  MAINTAINER:=Mazi Lo <openwrt.mazilo@xoxy.net>
-endef
-
-
-define Package/$(PKG_NAME)
-  $(call Package/$(PKG_NAME)/Default)
-  MENU:=1
-  TITLE:=FreeSWITCH open source telephony platform ($(PKG_SOURCE_VERSION_SHORT))
-  DEPENDS:=+FS_WITH_CORE_LIBEDIT_SUPPORT:libedit +FS_WITH_OPENSSL:libopenssl +libcurl +libdb47 +libfreetype +libgdbm $(ICONV_DEPENDS) $(INTL_DEPENDS) +libjpeg +libncurses +libopenldap +libpcre +libpng +libpthread +librt +libspeex +libspeexdsp +FS_WITH_SQLITE3:libsqlite3 +libsrtp +SSP_SUPPORT:libssp +libstdcpp +libuuid +PACKAGE_$(PKG_NAME)-mod-perl:perl
-endef
-
-
-define Package/$(PKG_NAME)/description
-  FreeSWITCH is an open source telephony platform designed to
-  facilitate the creation of voice and chat driven products 
-  scaling from a soft-phone up to a soft-switch.
-endef
-
-
-define Package/$(PKG_NAME)/config
-  source "$(SOURCE)/Config.in"
-endef
-
-
-define Package/$(PKG_NAME)-mod-spandsp/config
-    config FS_WITH_FIXED_POINT
-    depends on PACKAGE_$(PKG_NAME)-mod-spandsp
-    bool "Enable fixed point support for spandsp (may degrade performance)"
-    default n
-    help
-       Compile spandsp package with a fixed point support. ONLY enabled this
-       option when necessary, i.e. CPU doesn't support floating computation.
-endef
-
-
-define Package/$(PKG_NAME)-example-config
-  $(call Package/$(PKG_NAME)/Default)
-  TITLE:=FreeSWITCH example config (commented)
-  DEPENDS:= $(PKG_NAME)
-endef
-
-
-define Package/$(PKG_NAME)-example-config/description
-  The default configuration included with FreeSWITCH. It is not intended to be
-  a final product, and is thus moved to /usr/share/$(PKG_NAME)/examples/conf to
-  be an example of how FreeSWITCH can be configured.
-endef
-
-
-define Package/$(PKG_NAME)-config-upstream-defaults
-  $(call Package/$(PKG_NAME)/Default)
-  TITLE:=FreeSWITCH upstream config
-  DEPENDS:= $(PKG_NAME)
-endef
-
-
-define Package/$(PKG_NAME)-config-upstream-defaults/description
-  The default configuration included with FreeSWITCH. It is not intended to be
-  a final product, and but is included for those who don't want to use the
-  OpenWRT configuration and/or want to try things as prepared by upstream.
-endef
-
-
-define Package/$(PKG_NAME)-config-minimal
-  $(call Package/$(PKG_NAME)/Default)
-  TITLE:=FreeSWITCH minimal config
-  DEPENDS:= $(PKG_NAME)
-endef
-
-
-define Package/$(PKG_NAME)-config-minimal/description
-  A minimal configuration of FreeSWITCH for OpenWRT devices. Is what the UCI
-  configuration began with.
-endef
-
-
-define Package/$(PKG_NAME)-collection-upstream-defaults
-  $(call Package/$(PKG_NAME)/Default)
-  TITLE:=FS upstream def sample conf
-  DEPENDS:= $(PKG_NAME) \
-               +$(PKG_NAME)-mod-callcenter \
-               +$(PKG_NAME)-mod-commands \
-               +$(PKG_NAME)-mod-conference \
-               +$(PKG_NAME)-mod-curl \
-               +$(PKG_NAME)-mod-dialplan-xml \
-               +$(PKG_NAME)-mod-dingaling \
-               +$(PKG_NAME)-mod-dptools \
-               +$(PKG_NAME)-mod-event-socket \
-               +$(PKG_NAME)-mod-g723-1 \
-               +$(PKG_NAME)-mod-g729 \
-               +$(PKG_NAME)-mod-hash \
-               +$(PKG_NAME)-mod-http-cache \
-               +$(PKG_NAME)-mod-local-stream \
-               +$(PKG_NAME)-mod-lua \
-               +$(PKG_NAME)-mod-native-file \
-               +$(PKG_NAME)-mod-say-en \
-               +$(PKG_NAME)-mod-sndfile \
-               +$(PKG_NAME)-mod-sofia \
-               +$(PKG_NAME)-mod-syslog \
-               +$(PKG_NAME)-mod-tone-stream \
-               +$(PKG_NAME)-mod-xml-curl \
-               +$(PKG_NAME)-mod-xml-rpc \
-               +$(PKG_NAME)-tools
-endef
-
-
-define Package/$(PKG_NAME)-collection-minimal
-  $(call Package/$(PKG_NAME)/Default)
-  TITLE:=FreeSWITCH minimal package collection
-  DEFAULT:=y
-  DEPENDS:= $(PKG_NAME) \
-               +$(PKG_NAME)-config-minimal \
-               +$(PKG_NAME)-mod-commands \
-               +$(PKG_NAME)-mod-dialplan-xml \
-               +$(PKG_NAME)-mod-dptools \
-               +$(PKG_NAME)-mod-event-socket \
-               +$(PKG_NAME)-mod-hash \
-               +$(PKG_NAME)-mod-local-stream \
-               +$(PKG_NAME)-mod-sndfile \
-               +$(PKG_NAME)-mod-sofia \
-               +$(PKG_NAME)-mod-syslog \
-               +$(PKG_NAME)-mod-tone-stream \
-               +$(PKG_NAME)-tools
-endef
-
-
-define Package/$(PKG_NAME)-sounds-en-08KHz
-  $(call Package/$(PKG_NAME)/Default)
-  TITLE:=FreeSWITCH 8KHz english sounds
-  DEPENDS:= $(PKG_NAME)
-endef
-
-
-define Package/$(PKG_NAME)-sounds-en-16KHz
-  $(call Package/$(PKG_NAME)/Default)
-  TITLE:=FreeSWITCH 16KHz english sounds
-  DEPENDS:= +$(PKG_NAME)-sounds-en-08KHz
-endef
-
-
-define Package/$(PKG_NAME)-sounds-en-32KHz
-  $(call Package/$(PKG_NAME)/Default)
-  TITLE:=FreeSWITCH 32KHz english sounds
-  DEPENDS:= +$(PKG_NAME)-sounds-en-16KHz
-endef
-
-
-define Package/$(PKG_NAME)-sounds-en-48KHz
-  $(call Package/$(PKG_NAME)/Default)
-  TITLE:=FreeSWITCH 48KHz english sounds
-  DEPENDS:= +$(PKG_NAME)-sounds-en-32KHz
-endef
-
-
-define Package/$(PKG_NAME)-sounds-moh-08KHz
-  $(call Package/$(PKG_NAME)/Default)
-  TITLE:=FreeSWITCH 8KHz music-on-hold sounds
-  DEPENDS:= $(PKG_NAME)
-endef
-
-
-define Package/$(PKG_NAME)-sounds-moh-16KHz
-  $(call Package/$(PKG_NAME)/Default)
-  TITLE:=FreeSWITCH 16KHz music-on-hold sounds
-  DEPENDS:= +$(PKG_NAME)-sounds-moh-08KHz
-endef
-
-
-define Package/$(PKG_NAME)-sounds-moh-32KHz
-  $(call Package/$(PKG_NAME)/Default)
-  TITLE:=FreeSWITCH 32KHz music-on-hold sounds
-  DEPENDS:= +$(PKG_NAME)-sounds-moh-16KHz
-endef
-
-
-define Package/$(PKG_NAME)-sounds-moh-48KHz
-  $(call Package/$(PKG_NAME)/Default)
-  TITLE:=FreeSWITCH 48KHz music-on-hold sounds
-  DEPENDS:= +$(PKG_NAME)-sounds-moh-32KHz
-endef
-
-
-define Package/$(PKG_NAME)-tools
-  $(call Package/$(PKG_NAME)/Default)
-  TITLE:=FreeSWITCH control tools
-  DEPENDS:= $(PKG_NAME)
-endef
-
-
-define Download/files
- define Download/$(1)
-  FILE:=$(2)
-  URL:=$(if $(4),$(4),http://files.$(PKG_NAME).org)/$(5)
-  MD5SUM:=$(3)
- endef
- define Prepare/$(1)
-  $(LN) $(DL_DIR)/$(2) $(PKG_BUILD_DIR)/$(6)
- endef
- $$(eval $$(call Download,$(1)))
-endef
-
-
-MAKE_INSTALL_TARGETS:=install
-
-
-ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-curl),)
- $(eval $(call Download/files,json-cdr,json-c-0.9.tar.gz,4653b3b9c568bb9c782178abfaac128d,,downloads/libs/,libs/))
-endif
-
-
-ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-event-zmq),)
- $(eval $(call Download/files,event-zmq,zeromq-2.1.9.tar.gz,94c5e0262a79c5f82bc0b178c1f8a33d,http://download.zeromq.org http://download.zeromq.org/historic,,libs/))
-endif
-
-
-ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-mongo),)
- $(eval $(call Download/files,mongo,mongo-c-driver-0.92.2.tar.gz,afab25a33abd3f1e0ba79c5a9da92651,,downloads/libs/,libs/))
-endif
-
-
-ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-sounds-en-08KHz),)
- $(eval $(call Download/files,sounds-en-08KHz,$(PKG_NAME)-sounds-en-us-callie-8000-1.0.50.tar.gz,14cccba7b5c56f027fea391f1e0ee2d6,,,))
-       MAKE_INSTALL_TARGETS+= sounds-install
-endif
-
-
-ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-sounds-en-16KHz),)
- $(eval $(call Download/files,sounds-en-16KHz,$(PKG_NAME)-sounds-en-us-callie-16000-1.0.50.tar.gz,261f42e310baa97cc4dcfdc51971aff8,,,))
-       MAKE_INSTALL_TARGETS+= hd-sounds-install
-endif
-
-
-ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-sounds-en-32KHz),)
- $(eval $(call Download/files,sounds-en-32KHz,$(PKG_NAME)-sounds-en-us-callie-32000-1.0.50.tar.gz,f204512fadc49a3267ff4a5e899b77a5,,,))
-       MAKE_INSTALL_TARGETS+= uhd-sounds-install
-endif
-
-
-ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-sounds-en-48KHz),)
- $(eval $(call Download/files,sounds-en-48KHz,$(PKG_NAME)-sounds-en-us-callie-48000-1.0.50.tar.gz,8622a77a5d6dcf5e47bdf30d6a33e27c,,,))
-       MAKE_INSTALL_TARGETS+= cd-sounds-install
-endif
-
-
-ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-sounds-moh-08KHz),)
- $(eval $(call Download/files,sounds-moh-08KHz,$(PKG_NAME)-sounds-music-8000-1.0.50.tar.gz,c1f62dc26360f39f8eb442d5efd0a3aa,,,))
-       MAKE_INSTALL_TARGETS+= moh-install
-endif
-
-
-ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-sounds-moh-16KHz),)
- $(eval $(call Download/files,sounds-moh-16KHz,$(PKG_NAME)-sounds-music-16000-1.0.50.tar.gz,d253e26baa85e0e2e727a1cb1cca898e,,,))
-       MAKE_INSTALL_TARGETS+= hd-moh-install
-endif
-
-
-ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-sounds-moh-32KHz),)
- $(eval $(call Download/files,sounds-moh-32KHz,$(PKG_NAME)-sounds-music-32000-1.0.50.tar.gz,0e3ee69cb4ba2813ed0d3f7811332b63,,,))
-       MAKE_INSTALL_TARGETS+= uhd-moh-install
-endif
-
-
-ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-sounds-moh-48KHz),)
- $(eval $(call Download/files,sounds-moh-48KHz,$(PKG_NAME)-sounds-music-48000-1.0.50.tar.gz,873a62df1ab3be4191eb2488156ec2c2,,,))
-       MAKE_INSTALL_TARGETS+= cd-moh-install
-endif
-
-
-#
-# XXX: -fgnu89-inline is not supported on all compiler versions, so only enable it on avr32 where it solves build issues
-#
-ifneq ($(CONFIG_avr32),)
-  TARGET_CFLAGS += -fgnu89-inline
-  TARGET_CXXFLAGS += -fgnu89-inline
-endif
-
-
-ifneq ($(CONFIG_USE_EGLIBC),)
-  ifeq ($(CONFIG_EGLIBC_OPTION_EGLIBC_UTMP),)
-    TARGET_CFLAGS += -DNO_GETLOGIN
-  endif
-endif
-
-
-ifeq ($(CONFIG_LIBC),musl)
-       TARGET_CFLAGS += -D_GNU_SOURCE
-endif
-
-
-MAKE_FLAGS += \
-       AR="$(TOOLCHAIN_DIR)/bin/$(TARGET_CROSS)ar" \
-       CC="$(TOOLCHAIN_DIR)/bin/$(TARGET_CC)" \
-       CXX="$(TOOLCHAIN_DIR)/bin/$(TARGET_CXX)" \
-       RANLIB="$(TOOLCHAIN_DIR)/bin/$(TARGET_CROSS)ranlib" \
-       CC_FOR_BUILD="$(HOSTCC)" \
-
-
-MAKE_VARS += \
-       OPT_FLAGS+="$(TARGET_CFLAGS)"
-
-
-CONFIGURE_ARGS+= \
-       --host=$(GNU_TARGET_NAME) \
-       --build=$(GNU_HOST_NAME) \
-       --prefix="/usr/share/$(PKG_NAME)" \
-       --bindir="/usr/bin" \
-       --libdir="/usr/lib" \
-       --srcdir="$(PKG_BUILD_DIR)" \
-       --sysconfdir="/etc" \
-       --with-modinstdir="/usr/lib/$(PKG_NAME)" \
-       --with-random="/dev/urandom" \
-       $(call autoconf_bool,CONFIG_FS_WITH_BUILTIN_ZRTP,zrtp) \
-       $(call autoconf_bool,CONFIG_FS_WITH_CORE_LIBEDIT_SUPPORT,core-libedit-support) \
-       $(call autoconf_bool,CONFIG_FS_WITH_FHS,fhs) \
-       $(call autoconf_bool,CONFIG_FS_WITH_APR_IPV6,ipv6) \
-       $(call autoconf_bool,CONFIG_FS_WITH_LIBVPX,libvpx) \
-       $(call autoconf_bool,CONFIG_FS_WITH_LIBYUV,libyuv) \
-       $(call autoconf_bool,CONFIG_FS_WITH_LZMA,lzma) \
-       $(call autoconf_bool,CONFIG_FS_WITH_ODBC,core-odbc-support) \
-       $(call autoconf_bool,CONFIG_FS_WITH_OPT,optimization) \
-       $(call autoconf_bool,CONFIG_FS_WITH_POSTGRESQL,core-pgsql-pkgconfig) \
-       $(call autoconf_bool,CONFIG_FS_WITH_POSTGRESQL,core-pgsql-support) \
-       $(call autoconf_bool,CONFIG_FS_WITH_SILENT_RULES,silent-rules) \
-       $(call autoconf_bool,CONFIG_FS_WITH_SRTP,srtp) \
-       $(call autoconf_bool,CONFIG_FS_WITH_SRTP_GENERIC_AESICM,generic-aesicm) \
-       $(call autoconf_bool,CONFIG_FS_WITH_SRTP_KERNEL_LINUX,kernel-linux) \
-       $(call autoconf_bool,CONFIG_FS_WITH_SRTP_OPENSSL,openssl) \
-       $(call autoconf_bool,CONFIG_FS_WITH_STUN,stun) \
-       $(call autoconf_bool,CONFIG_FS_WITH_APR_THREADS,threads) \
-       $(call autoconf_bool,CONFIG_FS_WITH_VISIBILITY,visibility) \
-       $(call autoconf_bool,CONFIG_PACKAGE_$(PKG_NAME)-mod-spandsp && CONFIG_FS_WITH_FIXED_POINT,fixed-point) \
-       $(call autoconf_bool,CONFIG_PACKAGE_$(PKG_NAME)-mod-timerfd,timerfd-wrapper) \
-       $(if $(CONFIG_FS_WITH_ODBC),--with-odbc-lib="$(STAGING_DIR)/usr/lib") \
-       $(if $(CONFIG_FS_WITH_ODBC),--with-odbc="$(STAGING_DIR)/usr") \
-       $(if $(CONFIG_FS_WITH_OGG),--with-ogg="$(STAGING_DIR)/usr") \
-       $(if $(CONFIG_FS_WITH_OPENSSL),--with-openssl="pkg-config") \
-       $(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-erlang-event),--with-erlang="$(CONFIG_FS_WITH_ERLANG)",--without-erlang) \
-       $(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-java),--with-java="$(STAGING_DIR)/usr",--without-java) \
-       $(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-python),--with-python="$(CONFIG_FS_WITH_PYTHON_PATH)",--without-python) \
-       $(if ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-curl)|$(CONFIG_PACKAGE_$(PKG_NAME)-mod-xml-cdr)|$(CONFIG_PACKAGE_$(PKG_NAME)-mod-xml-curl)),--with-libcurl="$(STAGING_DIR)/usr",--without-libcurl) \
-       --with$(if $(CONFIG_FS_WITH_MYSQL),,out)-mysql \
-       --with$(if $(CONFIG_FS_WITH_POSTGRESQL),,out)-pgsql \
-       --with$(if $(CONFIG_FS_WITH_SQLITE3),,out)-sqlite3 \
-
-
-ifeq ($(CONFIG_TARGET_ARCH_PACKAGES),"kirkwood")
-       CONFIGURE_ARGS+= --enable-arm5e-asm \
-
-endif
-
-
-#ifeq ($(CONFIG_LIBC),"uClibc")
-ifeq ($(CONFIG_ARCH),"mips")
-       CONFIGURE_VARS+= \
-               ac_cv_file_dbd_apr_dbd_mysql_c="no" \
-
-endif
-#endif
-
-
-define Build/Prepare
-       $(call Build/Prepare/Default)
-       $(call Prepare/event-zmq)
-       $(call Prepare/json-cdr)
-       $(call Prepare/mongo)
-       $(if $(CONFIG_PACKAGE_$(PKG_NAME)-sounds-en-08KHz),$(call Prepare/sounds-en-08KHz))
-       $(if $(CONFIG_PACKAGE_$(PKG_NAME)-sounds-en-16KHz),$(call Prepare/sounds-en-16KHz))
-       $(if $(CONFIG_PACKAGE_$(PKG_NAME)-sounds-en-32KHz),$(call Prepare/sounds-en-32KHz))
-       $(if $(CONFIG_PACKAGE_$(PKG_NAME)-sounds-en-48KHz),$(call Prepare/sounds-en-48KHz))
-       $(if $(CONFIG_PACKAGE_$(PKG_NAME)-sounds-moh-08KHz),$(call Prepare/sounds-moh-08KHz))
-       $(if $(CONFIG_PACKAGE_$(PKG_NAME)-sounds-moh-16KHz),$(call Prepare/sounds-moh-16KHz))
-       $(if $(CONFIG_PACKAGE_$(PKG_NAME)-sounds-moh-32KHz),$(call Prepare/sounds-moh-32KHz))
-       $(if $(CONFIG_PACKAGE_$(PKG_NAME)-sounds-moh-48KHz),$(call Prepare/sounds-moh-48KHz))
-ifeq ($(CONFIG_FS_WITH_LOCAL_SOURCE),y)
-       (cd $(PKG_BUILD_DIR); $(if $(CONFIG_FS_WITH_LATEST_HEAD),if $(QUILT_CMD) top > /dev/null 2>&1 && [ -f $(PKG_BUILD_DIR)/patches/series ]; then $(QUILT_CMD) pop -a; fi; git pull;) if $(QUILT_CMD) next > /dev/null 2>&1; then $(QUILT_CMD) push -a; fi)
-endif
-       (cd $(PKG_BUILD_DIR); $(AM_TOOL_PATHS) ./bootstrap.sh)
-endef
-
-
-define Build/Configure
-       $(foreach m,$(FS_MOD_AVAILABLE),
-               $(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-$(m)),
-                       $(SED) 's|^[ #]*\([^#]*/mod_$(subst -,_,$(m))\)$$$$|\1|g' $(PKG_BUILD_DIR)/modules.conf
-               ,
-                       $(SED) 's|^\([^#]*/mod_$(subst -,_,$(m))\)$$$$|#\1|g' $(PKG_BUILD_DIR)/modules.conf
-               )
-       )
-       $(call Build/Configure/Default)
-endef
-
-
-define Build/Compile
-       $(call Build/Compile/Default, \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all $(MAKE_INSTALL_TARGETS) \
-       )
-       $(SED) 's|^\([ \t]*\)\(.*\)"mod_console"\(.*\)$$$$|\1<!-- \2"mod_console"\3 -->|' $(PKG_INSTALL_DIR)/etc/$(PKG_NAME)/autoload_configs/modules.conf.xml
-       $(SED) 's|^\([ \t]*\)<!-- *\(.*\)"mod_syslog"\(.*\) *-->\(.*\)$$$$|\1\2"mod_syslog"\3\4|' $(PKG_INSTALL_DIR)/etc/$(PKG_NAME)/autoload_configs/modules.conf.xml
-endef
-
-
-define Package/$(PKG_NAME)/install
-       $(INSTALL_DIR) $(1)/etc/config
-       $(INSTALL_DIR) $(1)/etc/default
-       $(INSTALL_DIR) $(1)/etc/$(PKG_NAME)
-       $(INSTALL_DIR) $(1)/etc/$(PKG_NAME)/scripts
-       $(INSTALL_DIR) $(1)/etc/hotplug.d/iface
-       $(INSTALL_DIR) $(1)/etc/init.d
-       $(INSTALL_DIR) $(1)/usr/bin
-       $(INSTALL_DIR) $(1)/usr/lib
-       $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-       $(INSTALL_BIN) ./files/$(PKG_NAME).init $(1)/etc/init.d/$(PKG_NAME)
-       $(INSTALL_DATA) ./files/$(PKG_NAME).config $(1)/etc/config/$(PKG_NAME)
-       $(INSTALL_DATA) ./files/$(PKG_NAME).default $(1)/etc/default/$(PKG_NAME)
-       $(INSTALL_DATA) ./files/$(PKG_NAME).hotplug $(1)/etc/hotplug.d/iface/90-$(PKG_NAME)
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/$(PKG_NAME) $(1)/usr/bin/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib$(PKG_NAME)* $(1)/usr/lib/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/$(PKG_NAME).pc $(1)/usr/lib/pkgconfig/
-       $(if $(1)/usr/lib/lib$(PKG_NAME).la,$(STAGING_DIR_HOST)/bin/sed -i -re 's|$(STAGING_DIR)||g;s|$(TOOLCHAIN_DIR)||g;s|$(TARGET_CROSS)|usr|g;s|$(REAL_GNU_TARGET_NAME)|usr|g;s|-L$(PKG_BUILD_DIR)(.*)libzrtp ||g;:a;s|((-[IL]/\S+\s).*)\2|\1|;ta' $(1)/usr/lib/lib$(PKG_NAME).la)
-endef
-
-
-define Package/$(PKG_NAME)-collection-upstream-defaults/install
-       $(INSTALL_DIR) $(1)/etc/$(PKG_NAME)
-endef
-
-
-define Package/$(PKG_NAME)-example-config/install
-       $(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/examples/conf
-       $(CP) $(PKG_INSTALL_DIR)/etc/$(PKG_NAME)/* $(1)/usr/share/$(PKG_NAME)/examples/conf/
-endef
-
-
-define Package/$(PKG_NAME)-config-upstream-defaults/install
-       $(INSTALL_DIR) $(1)/etc/$(PKG_NAME)
-       $(CP) $(PKG_INSTALL_DIR)/etc/$(PKG_NAME) $(1)/etc
-endef
-
-
-define Package/$(PKG_NAME)-collection-minimal/install
-       $(INSTALL_DIR) $(1)/etc/$(PKG_NAME)
-endef
-
-
-define Package/$(PKG_NAME)-collection-uci-minimal/install
-       $(INSTALL_DIR) $(1)/etc/$(PKG_NAME)
-endef
-
-
-define Package/$(PKG_NAME)-config-minimal/install
-       $(INSTALL_DIR) $(1)/etc/$(PKG_NAME)/autoload_configs
-
-       #
-       # Copying dialplan directory jingle_profiles sip_profiles $(PKG_NAME).xml
-       # fur_elise.ttml mime.types tetris.ttml tones.conf vars.xml
-       #
-       $(foreach f,dialplan directory jingle_profiles sip_profiles $(PKG_NAME).xml fur_elise.ttml mime.types tetris.ttml vars.xml,$(if $(PKG_BUILD_DIR)/conf/vanilla/$(f),$(CP) $(PKG_BUILD_DIR)/conf/vanilla/$(f) $(1)/etc/$(PKG_NAME);))
-
-       #
-       # Copying acl ivr modules post_load_modules switch timezones
-       #
-       $(foreach f,acl ivr modules post_load_modules switch timezones,$(if $(PKG_BUILD_DIR)/conf/vanilla/autoload_configs/$(f).conf.xml,$(CP) $(PKG_BUILD_DIR)/conf/vanilla/autoload_configs/$(f).conf.xml $(1)/etc/$(PKG_NAME)/autoload_configs;))
-endef
-
-
-define Package/$(PKG_NAME)-sounds-en-08KHz/install
-       #
-       # sounds-en-8KHz
-       #
-       for dir in `(cd $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/sounds/en/us/callie;ls)`; \
-       do \
-               [ -d $(1)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/8000 ] || $(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/8000; \
-               $(CP) $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/8000/* $(1)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/8000; \
-       done
-endef
-
-
-define Package/$(PKG_NAME)-sounds-en-16KHz/install
-       #
-       # sounds-en-16KHz
-       #
-       for dir in `(cd $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/sounds/en/us/callie;ls)`; \
-       do \
-               [ -d $(1)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/16000 ] || $(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/16000; \
-               $(CP) $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/16000/* $(1)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/16000; \
-       done
-endef
-
-
-define Package/$(PKG_NAME)-sounds-en-32KHz/install
-       #
-       # sounds-en-32KHz
-       #
-       for dir in `(cd $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/sounds/en/us/callie;ls)`; \
-       do \
-               [ -d $(1)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/32000 ] || $(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/32000; \
-               $(CP) $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/32000/* $(1)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/32000; \
-       done
-endef
-
-
-define Package/$(PKG_NAME)-sounds-en-48KHz/install
-       #
-       # sounds-en-48KHz
-       #
-       for dir in `(cd $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/sounds/en/us/callie;ls)`; \
-       do \
-               [ -d $(1)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/48000 ] || $(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/48000; \
-               $(CP) $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/48000/* $(1)/usr/share/$(PKG_NAME)/sounds/en/us/callie/$$$${dir}/48000; \
-       done
-endef
-
-
-define Package/$(PKG_NAME)-sounds-moh-08KHz/install
-       #
-       # sounds-moh-8KHz
-       #
-       [ -d $(1)/usr/share/$(PKG_NAME)/sounds/music/8000 ] || $(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/sounds/music/8000;
-       $(CP) $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/sounds/music/8000 $(1)/usr/share/$(PKG_NAME)/sounds/music;
-endef
-
-
-define Package/$(PKG_NAME)-sounds-moh-16KHz/install
-       #
-       # sounds-moh-16KHz
-       #
-       [ -d $(1)/usr/share/$(PKG_NAME)/sounds/music/16000 ] || $(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/sounds/music/16000;
-       $(CP) $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/sounds/music/16000 $(1)/usr/share/$(PKG_NAME)/sounds/music;
-endef
-
-
-define Package/$(PKG_NAME)-sounds-moh-32KHz/install
-       #
-       # sounds-moh-32KHz
-       #
-       [ -d $(1)/usr/share/$(PKG_NAME)/sounds/music/32000 ] || $(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/sounds/music/32000;
-       $(CP) $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/sounds/music/32000 $(1)/usr/share/$(PKG_NAME)/sounds/music;
-endef
-
-
-define Package/$(PKG_NAME)-sounds-moh-48KHz/install
-       #
-       # sounds-moh-48KHz
-       #
-       [ -d $(1)/usr/share/$(PKG_NAME)/sounds/music/48000 ] || $(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/sounds/music/48000;
-       $(CP) $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/sounds/music/48000 $(1)/usr/share/$(PKG_NAME)/sounds/music;
-endef
-
-
-define Package/$(PKG_NAME)-tools/install
-       $(INSTALL_DIR) $(1)/usr/bin
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/fs_cli $(1)/usr/bin/
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/fs_encode $(1)/usr/bin/
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/fs_ivrd $(1)/usr/bin/
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/fsxs $(1)/usr/bin/
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/gentls_cert $(1)/usr/bin/
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/tone2wav $(1)/usr/bin/
-       $(STAGING_DIR_HOST)/bin/sed -i -re 's|$(ICONV_LDFLAGS)||g;s|$(INTL_LDFLAGS)||g;s|$(PKG_BUILD_DIR)|/usr|g;s|$(STAGING_DIR)||g;s|$(STAGING_DIR_HOST)|/usr|g;s|$(TOOLCHAIN_DIR)||g;s|$(TARGET_CROSS)|usr|g;s|$(REAL_GNU_TARGET_NAME)|usr|g;:a;s|((-[IL]/\S+\s).*)[ ,\n]\1|\1|;ta' $(1)/usr/bin/fsxs
-endef
-
-
-# 1. Name
-# 2. Title
-# 3. Selection on module configuration file
-# 4. Files (module files include different names)
-# 5. Files (supporting files include different names)
-# 6. Inter module depends
-# 7. Extra depends
-#
-define BuildPlugin
-  define Package/$(PKG_NAME)-mod-$(1)
-    $$(call Package/$(PKG_NAME)/Default)
-    TITLE:= FS $(2) module
-    DEPENDS:= $(PKG_NAME) $(foreach m,$(6),+$(PKG_NAME)-mod-$(m)) $(7)
-  endef
-
-  define Package/$(PKG_NAME)-mod-$(1)/install
-       [ -z "mod_$(subst -,_,$(1))" ] || $(INSTALL_DIR) $$(1)/usr/lib/$(PKG_NAME)
-
-       for f in $$$$(realpath $$$$(wildcard $(PKG_INSTALL_DIR)/usr/lib/$(PKG_NAME)/mod_$(subst -,_,$(1)).*)) $$$$(wildcard $(PKG_INSTALL_DIR)/usr/lib/$(PKG_NAME)/$(4)_*); \
-       do \
-               $(CP) $$$$$$$${f} $$(1)/usr/lib/$(PKG_NAME)/; \
-       done
-
-       #
-       # mod_$(subst -,_,$(1)): $(5)
-       #
-       $(foreach f,$(5),[ -d $(dir $$(1)/usr/${f}) ] || $(INSTALL_DIR) $(dir $$(1)/usr/${f});$(CP) $$$$(wildcard $(PKG_INSTALL_DIR)/usr/${f}*) $(dir $$(1)/usr/${f});)
-
-       #
-       # mod_$(subst -,_,$(1)): Clean installed library control files from referencig to OpenWRT PATH.
-       #
-       $(STAGING_DIR_HOST)/bin/sed -i -re 's|$(STAGING_DIR)||g;s|$(TOOLCHAIN_DIR)||g;s|$(TARGET_CROSS)|usr|g;s|$(REAL_GNU_TARGET_NAME)|usr|g;s|-L$(PKG_BUILD_DIR)(.*)libzrtp ||g;s|-L$(PKG_BUILD_DIR)(.*)libtiff ||g;:a;s|((-[IL]/\S+\s).*)\2|\1|;ta' $(foreach l,`find $$(1)/usr/lib -name "*.la" -print`,$(l))
-
-       #
-       # 1. mod_$(subst -,_,$(1)) XML configuration files from: $$$$(patsubst $(PKG_BUILD_DIR)/%,%,$$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/conf/$(3)/autoload_configs/$(subst -,_,$(1)).conf.xml)))
-       #
-       $$$$(if $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/conf/$(3)/autoload_configs/$(subst -,_,$(1)).conf.xml)),[ -d $$(1)/etc/$(PKG_NAME)/autoload_configs ] || $(INSTALL_DIR) $$(1)/etc/$(PKG_NAME)/autoload_configs;$(CP) $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/conf/$(3)/autoload_configs/$(subst -,_,$(1)).conf.xml)) $$(1)/etc/$(PKG_NAME)/autoload_configs;$(SED) 's|/usr/local/lib|/usr/lib|g;s|/usr/local|/etc|g' $$(1)/etc/$(PKG_NAME)/autoload_configs/$(subst -,_,$(1)).conf.xml)
-
-       #
-       # 2. mod_$(subst -,_,$(1)) XML configuration files from: $$$$(patsubst $(PKG_BUILD_DIR)/%,%,$$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/$(3)/$(1)/*/$(subst -,_,$(1)).conf.xml)))
-       #
-       $$$$(if $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/$(3)/$(1)/*/$(subst -,_,$(1)).conf.xml)),[ -d $$(1)/etc/$(PKG_NAME)/autoload_configs ] || $(INSTALL_DIR) $$(1)/etc/$(PKG_NAME)/autoload_configs;$(CP) $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/$(3)/$(1)/*/$(subst -,_,$(1)).conf.xml)) $$(1)/etc/$(PKG_NAME)/autoload_configs;$(SED) 's|/usr/local/lib|/usr/lib|g;s|/usr/local|/etc|g' $$(1)/etc/$(PKG_NAME)/autoload_configs/$(subst -,_,$(1)).conf.xml)
-
-       #
-       # 3. mod_$(subst -,_,$(1)) XML configuration files from: $$$$(patsubst $(PKG_BUILD_DIR)/%,%,$$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/src/$(3)/*/mod_$(subst -,_,$(1))/conf/autoload_configs/$(subst -,_,$(1)).conf.xml)))
-       #
-       $$$$(if $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/src/$(3)/*/mod_$(subst -,_,$(1))/conf/autoload_configs/$(subst -,_,$(1)).conf.xml)),[ -d $$(1)/etc/$(PKG_NAME)/autoload_configs ] || $(INSTALL_DIR) $$(1)/etc/$(PKG_NAME)/autoload_configs;$(CP) $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/src/$(3)/*/mod_$(subst -,_,$(1))/conf/autoload_configs/$(subst -,_,$(1)).conf.xml)) $$(1)/etc/$(PKG_NAME)/autoload_configs;$(SED) 's|/usr/local/lib|/usr/lib|g;s|/usr/local|/etc|g' $$(1)/etc/$(PKG_NAME)/autoload_configs/$(subst -,_,$(1)).conf.xml)
-
-       #
-       # 4. mod_$(subst -,_,$(1)) XML configuration files from: $$$$(patsubst $(PKG_BUILD_DIR)/%,%,$$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/src/$(3)/*/mod_$(subst -,_,$(1))/conf*/$(subst -,_,$(1)).conf.xml)))
-       #
-       $$$$(if $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/src/$(3)/*/mod_$(subst -,_,$(1))/conf*/$(subst -,_,$(1)).conf.xml)),[ -d $$(1)/etc/$(PKG_NAME)/autoload_configs ] || $(INSTALL_DIR) $$(1)/etc/$(PKG_NAME)/autoload_configs;$(CP) $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/src/$(3)/*/mod_$(subst -,_,$(1))/conf*/$(subst -,_,$(1)).conf.xml)) $$(1)/etc/$(PKG_NAME)/autoload_configs;$(SED) 's|/usr/local/lib|/usr/lib|g;s|/usr/local|/etc|g' $$(1)/etc/$(PKG_NAME)/autoload_configs/$(subst -,_,$(1)).conf.xml)
-
-       #
-       # 5. mod_$(subst -,_,$(1)) XML configuration files from: $$$$(patsubst $(PKG_BUILD_DIR)/%,%,$$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/src/$(3)/*/mod_$(subst -,_,$(1))/$(subst -,_,$(1)).conf.xml)))
-       #
-       $$$$(if $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/src/$(3)/*/mod_$(subst -,_,$(1))/$(subst -,_,$(1)).conf.xml)),[ -d $$(1)/etc/$(PKG_NAME)/autoload_configs ] || $(INSTALL_DIR) $$(1)/etc/$(PKG_NAME)/autoload_configs;$(CP) $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/src/$(3)/*/mod_$(subst -,_,$(1))/$(subst -,_,$(1)).conf.xml)) $$(1)/etc/$(PKG_NAME)/autoload_configs;$(SED) 's|/usr/local/lib|/usr/lib|g;s|/usr/local|/etc|g' $$(1)/etc/$(PKG_NAME)/autoload_configs/$(subst -,_,$(1)).conf.xml)
-
-       #
-       # 6. Additional configuration files for mod_$(subst -,_,$(1)) from: $$$$(patsubst $(PKG_BUILD_DIR)/%,%,$$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/conf/$(3)/$(1)/*.$(1))))
-       #
-       $$$$(if $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/conf/$(3)/$(1)/*.$(1))),[ -d $$(1)/etc/$(PKG_NAME)/$(1) ] || $(INSTALL_DIR) $$(1)/etc/$(PKG_NAME)/$(1);$(CP) $(PKG_BUILD_DIR)/conf/$(3)/$(1) $$(1)/etc/$(PKG_NAME))
-  endef
-
-  define Package/$(PKG_NAME)-mod-$(1)/postinst
-#!/bin/sh
-sed -i -e 's#[^ \t]\(,*\)\(.*\)"mod_console"/>\(.*\)$$$$#\1<load module="mod_console"/>#g' $$$${IPKG_INSTROOT}/etc/$(PKG_NAME)/autoload_configs/modules.conf.xml
-exit 0
-  endef
-
-  define Package/$(PKG_NAME)-mod-$(1)/prerm
-#!/bin/sh
-sed -i -e 's#[^ \t]\(,*\)\(.*\)"mod_console"/>\(.*\)$$$$#\1<!-- <load module="mod_console"/> -->#g' $$$${IPKG_INSTROOT}/etc/$(PKG_NAME)/autoload_configs/modules.conf.xml
-exit 0
-  endef
-
-  $$(eval $$(call BuildPackage,$(PKG_NAME)-mod-$(1)))
-endef
-
-
-$(eval $(call BuildPackage,$(PKG_NAME)))
-$(eval $(call BuildPackage,$(PKG_NAME)-collection-upstream-defaults))
-$(eval $(call BuildPackage,$(PKG_NAME)-collection-minimal))
-$(eval $(call BuildPackage,$(PKG_NAME)-sounds-en-08KHz))
-$(eval $(call BuildPackage,$(PKG_NAME)-sounds-en-16KHz))
-$(eval $(call BuildPackage,$(PKG_NAME)-sounds-en-32KHz))
-$(eval $(call BuildPackage,$(PKG_NAME)-sounds-en-48KHz))
-$(eval $(call BuildPackage,$(PKG_NAME)-sounds-moh-08KHz))
-$(eval $(call BuildPackage,$(PKG_NAME)-sounds-moh-16KHz))
-$(eval $(call BuildPackage,$(PKG_NAME)-sounds-moh-32KHz))
-$(eval $(call BuildPackage,$(PKG_NAME)-sounds-moh-48KHz))
-$(eval $(call BuildPackage,$(PKG_NAME)-tools))
-$(eval $(call BuildPackage,$(PKG_NAME)-example-config))
-$(eval $(call BuildPackage,$(PKG_NAME)-config-upstream-defaults))
-$(eval $(call BuildPackage,$(PKG_NAME)-config-minimal))
-
-
-#
-# $(eval $(call BuildPlugin,Name,Title,Selection on module Conf File,Files,Inter Depends,Extra Depends))
-#
-$(eval $(call BuildPlugin,abstraction,An Abstraction To API Call,vanilla,,,,))
-$(eval $(call BuildPlugin,alsa,Alsa Endpoint,vanilla,,,,+FS_WITH_ALSA:alsa-lib @FS_WITH_ALSA))
-$(eval $(call BuildPlugin,amr,Adaptive Multi-Rate On Bandwidth Codec,vanilla,,,,))
-$(eval $(call BuildPlugin,amrwb,Wide Band AMR,vanilla,,,,))
-$(eval $(call BuildPlugin,av,FS Video Codec / File Format,vanilla,,,,@BROKEN))
-$(eval $(call BuildPlugin,avmd,Advanced Voice Mail Detection,vanilla,,,,))
-$(eval $(call BuildPlugin,basic,BASIC,vanilla,,,,))
-$(eval $(call BuildPlugin,bert,Naive Bit Error Rate Tester,vanilla,,,,))
-$(eval $(call BuildPlugin,blacklist,Blacklist,vanilla,,,,))
-$(eval $(call BuildPlugin,bv,BroadVoice 16/32-bit Audio Codec,vanilla,,,,@BROKEN)) # Requires unsupported libbroadvoice
-$(eval $(call BuildPlugin,callcenter,Call Center,vanilla,,,,))
-$(eval $(call BuildPlugin,cdr-csv,CSV-CDR Handler,mod,,,,)) # ~/conf
-$(eval $(call BuildPlugin,cdr-mongodb,MongoDB CDR logger,vanilla,,,,))
-$(eval $(call BuildPlugin,cdr-pg-csv,PostgreSQL CDR Handler,vanilla,,,,+coreutils +FS_WITH_POSTGRESQL:libpq @FS_WITH_POSTGRESQL))
-$(eval $(call BuildPlugin,cdr-sqlite,SQLite3 CDR Handler,vanilla,,,,@FS_WITH_SQLITE3))
-$(eval $(call BuildPlugin,cepstral,Cepstral Interface,vanilla,,,,@BROKEN)) # needs <swift.h>
-$(eval $(call BuildPlugin,cidlookup,Data Query For CID->NAME Services,mod,,,,+libcurl)) # ~/conf
-$(eval $(call BuildPlugin,cluechoo,Framework Demo,vanilla,,,,))
-$(eval $(call BuildPlugin,codec2,CoDec 2,,,,,@BROKEN)) # Requires unsupported libcodec2
-$(eval $(call BuildPlugin,commands,API Commands,vanilla,,,,))
-$(eval $(call BuildPlugin,conference,Conference Room,vanilla,,,,))
-$(eval $(call BuildPlugin,console,Console Logger,vanilla,,,,))
-$(eval $(call BuildPlugin,curl,HTTP Request,vanilla,,,,+libcurl))
-$(eval $(call BuildPlugin,cv,Detect Video motion,vanilla,,,,@BROKEN))
-$(eval $(call BuildPlugin,dahdi-codec,DAHDI Codecs,vanilla,,,,))
-$(eval $(call BuildPlugin,db,Database Backend,vanilla,,,,+libdb47))
-$(eval $(call BuildPlugin,dialplan-asterisk,Asterisk Dialplan Parser,vanilla,,,,))
-$(eval $(call BuildPlugin,dialplan-directory,Dialplan Directory,vanilla,,,,))
-$(eval $(call BuildPlugin,dialplan-xml,Dialplan-XML Interface,vanilla,,,,))
-$(eval $(call BuildPlugin,dingaling,Jabber Interface,vanilla,,,,+libopenssl))
-$(eval $(call BuildPlugin,directory,Search By Name Directory IVR,vanilla,,,,))
-$(eval $(call BuildPlugin,distributor,Simple Robin-Round Load,vanilla,,,,))
-$(eval $(call BuildPlugin,dptools,Dialplan Tools,vanilla,,,,))
-$(eval $(call BuildPlugin,easyroute,Simple DID Routing,vanilla,,,,))
-$(eval $(call BuildPlugin,enum,ENUM Routing,,,,,+libldns))
-$(eval $(call BuildPlugin,erlang-event,Erlang Event Handler,vanilla,,,,+erlang))
-$(eval $(call BuildPlugin,esf,Extra SIP Functionality,vanilla,,,,))
-$(eval $(call BuildPlugin,esl,Allow to generate remote ESL commands,vanilla,,,,@BROKEN))
-$(eval $(call BuildPlugin,event-multicast,Multicast Event Handler,vanilla,,,,))
-$(eval $(call BuildPlugin,event-socket,Socket Event Handler,vanilla,,,,))
-$(eval $(call BuildPlugin,event-zmq,Socket Event Handler By Zero MQ,vanilla,,,,+libuuid))
-$(eval $(call BuildPlugin,expr,Expression Evaluation,vanilla,,,,))
-$(eval $(call BuildPlugin,fifo,FIFO,vanilla,,,,))
-$(eval $(call BuildPlugin,file-string,Streaming Multiple Sound Files Sequentially,vanilla,,,,@OBSOLETE)) # merged into dptools
-#$(eval $(call BuildPlugin,flite,Festival TTS,vanilla,,,,+flite @BROKEN)) # flite is from old package repo
-$(eval $(call BuildPlugin,format-cdr,XML CDR Module to files or curl,vanilla,,,,))
-$(eval $(call BuildPlugin,fsk,Bell-202 1200-Baud FSK Decoder,vanilla,,,,))
-#$(eval $(call BuildPlugin,fsv,Video Player / Recorder,vanilla,,,,+libyuv @BROKEN)) # Requires unsupported libyuv.
-$(eval $(call BuildPlugin,g723-1,G.723.1 Codec,vanilla,,,,))
-$(eval $(call BuildPlugin,g729,G.729 Codec,vanilla,,,,))
-$(eval $(call BuildPlugin,graylog2,Graylog2 GELF logger,vanilla,,,,))
-$(eval $(call BuildPlugin,gsmopen,GSM Modem compatible Endpoint,mod,,,alsa,+FS_WITH_ALSA:alsa-lib +FS_WITH_LZMA:liblzma @FS_WITH_ALSA @BROKEN)) # needs gsmlib
-$(eval $(call BuildPlugin,h26x,H26X Linear Codec,vanilla,,,,))
-#$(eval $(call BuildPlugin,h323,H323 Endpoint,mod,,,,@BROKEN)) # Req. H323Plus v1.24.x or newer
-$(eval $(call BuildPlugin,hash,API For Manipulating A Hash Table,vanilla,,,,))
-$(eval $(call BuildPlugin,hiredis,Redis DB access,vanilla,,,,+libhiredis @BROKEN))
-#$(eval $(call BuildPlugin,html5,HTML5 Endpoint Module,vanilla,,,,)) # defunct?
-$(eval $(call BuildPlugin,httapi,HT Telephony API and HTTP Caching,mod,,,,)) # ~/conf
-$(eval $(call BuildPlugin,http-cache,HTTP GET With Caching,mod,,,,+libcurl)) # ~/conf
-#$(eval $(call BuildPlugin,ilbc,ILBC Codec,vanilla,,,,+libilbc @BROKEN)) # Requires unsupported libilbc.
-$(eval $(call BuildPlugin,isac,iSAC Codec,vanilla,,,,))
-#$(eval $(call BuildPlugin,java,Java Language Interface,vanilla,,,,@BROKEN)) # needs java
-$(eval $(call BuildPlugin,json-cdr,JSon-CDR Interface,mod,,,,+libcurl))
-$(eval $(call BuildPlugin,kazoo,Socket Controlled Event Handler,vanilla,,,,+erlang))
-$(eval $(call BuildPlugin,ldap,LDAP interface,vanilla,,,,+libopenldap))
-$(eval $(call BuildPlugin,lcr,Least Cost Routing,vanilla,,,,))
-$(eval $(call BuildPlugin,local-stream,Multi-Channel On Same Stream,vanilla,,,,))
-$(eval $(call BuildPlugin,logfile,File Logger,vanilla,,,,))
-$(eval $(call BuildPlugin,loopback,Loopback to Dialplan Endpoint,vanilla,,,,))
-$(eval $(call BuildPlugin,lua,LUA Language Interface,vanilla,,,,+liblua))
-#$(eval $(call BuildPlugin,managed,Media Switching Software Library,vanilla,,,,+glib2 @BROKEN)) # needs Mono
-#$(eval $(call BuildPlugin,memcache,MemCached Interface,vanilla,,,,+libmemcached @BROKEN)) # Req host libmemcached
-#$(eval $(call BuildPlugin,mongo,A Document-Oriented Database,vanilla,,,,@BROKEN))
-#$(eval $(call BuildPlugin,mp4,MP4 File Format Support For Video,vanilla,,,,@BROKEN)) # needs host libmp4v2
-$(eval $(call BuildPlugin,mp4v,MP4 CoDec Support For Video,vanilla,,,,))
-$(eval $(call BuildPlugin,native-file,WAV Format Sound Player,vanilla,,,,))
-$(eval $(call BuildPlugin,nibblebill,Credit / Debit Billing,vanilla,,,,))
-$(eval $(call BuildPlugin,opus,Opus CoDec,vanilla,,,,+libopus))
-$(eval $(call BuildPlugin,oreka,Media Recording with Oreka,vanilla,,,,))
-$(eval $(call BuildPlugin,png,play a png as video with audio,vanilla,,,,+libpng))
-$(eval $(call BuildPlugin,perl,Perl Language Interface,vanilla,,lib/perl5/$(PERL_VERSION)/CORE/$(PKG_NAME).la lib/perl5/$(PERL_VERSION)/CORE/$(PKG_NAME).pm lib/perl5/$(PERL_VERSION)/CORE/$(PKG_NAME).so,,+perl +libdb47 +libgdbm))
-$(eval $(call BuildPlugin,portaudio,Portaudio To Sound Card Interface,vanilla,,,alsa,+FS_WITH_ALSA:alsa-lib @FS_WITH_ALSA @BROKEN)) # needs portaudio
-$(eval $(call BuildPlugin,portaudio-stream,Portaudio Streaming Interface,vanilla,,,alsa,+FS_WITH_ALSA:alsa-lib @FS_WITH_ALSA @BROKEN)) # needs portaudio
-$(eval $(call BuildPlugin,posix-timer,POSIX Compliant Soft Timer,vanilla,,,,))
-$(eval $(call BuildPlugin,prefix,longest-prefix match in store,mod,,,,))
-$(eval $(call BuildPlugin,python,Python Language Interface,vanilla,,lib/python$(PYTHON3_VERSION)/site-packages/freeswitch.py,,+FS_WITH_PYTHON:python3 @FS_WITH_PYTHON))
-#$(eval $(call BuildPlugin,radius-cdr,Radius-CDR interface,vanilla,,,,+freeradius3 @BROKEN)) # fails in freeradius-client
-$(eval $(call BuildPlugin,rayo,Rayo server & node implementation,vanilla,,,,))
-$(eval $(call BuildPlugin,redis,Redis limit backend,vanilla,,,,))
-$(eval $(call BuildPlugin,rss,RRS Feeds via TTS,vanilla,,,,))
-$(eval $(call BuildPlugin,rtc,RTC endpoint,vanilla,,,,))
-$(eval $(call BuildPlugin,rtmp,RTMP Protocol Handler,vanilla,,,,))
-#$(eval $(call BuildPlugin,sangoma-codec,Sangoma Codec,vanilla,,,,@BROKEN)) # Req. Sangoma CoDec source
-$(eval $(call BuildPlugin,say-de,German Say,vanilla,,,,))
-$(eval $(call BuildPlugin,say-en,English Say,vanilla,,,,))
-$(eval $(call BuildPlugin,say-es,Spanish Say,vanilla,,,,))
-$(eval $(call BuildPlugin,say-fa,Persian Say,vanilla,,,,))
-$(eval $(call BuildPlugin,say-fr,French Say,vanilla,,,,))
-$(eval $(call BuildPlugin,say-hu,Hungarian Say,vanilla,,,,))
-$(eval $(call BuildPlugin,say-it,Italian Say,vanilla,,,,))
-$(eval $(call BuildPlugin,say-nl,Dutch Say,vanilla,,,,))
-$(eval $(call BuildPlugin,say-pt,Portugeese Say,vanilla,,,,))
-$(eval $(call BuildPlugin,say-ru,Russian Say,vanilla,,,,))
-$(eval $(call BuildPlugin,say-th,Thai Say,vanilla,,,,))
-$(eval $(call BuildPlugin,say-zh,Chineese Say,vanilla,,,,))
-$(eval $(call BuildPlugin,shell-stream,Streaming Audio Through CLI,vanilla,,,,))
-#$(eval $(call BuildPlugin,silk,Skype(TM) SILK Codec Module,vanilla,,,,+libsilk @BROKEN)) # Requires unsupported libsilk
-#$(eval $(call BuildPlugin,siren,G.722.1 Codec,vanilla,,,,+libg7221 @BROKEN)) # Requires unsupported libg7221
-#$(eval $(call BuildPlugin,skel,Template For New Module,vanilla,,,,@BROKEN))
-$(eval $(call BuildPlugin,skinny,Skinny Call Control Protocol (SCCP),vanilla,,,,))
-$(eval $(call BuildPlugin,skypopen,Skype Compatible Endpoint,mod,,,,@FEATURE_drawing-backend_libX11))
-$(eval $(call BuildPlugin,sms,SMS,vanilla,,,,))
-#$(eval $(call BuildPlugin,smpp,smpp client and server implementation,vanilla,,,,@BROKEN))
-$(eval $(call BuildPlugin,snapshot,Record Audio Snapshot to File,vanilla,,,,))
-$(eval $(call BuildPlugin,sndfile,Multi-Format Sound File,vanilla,,,,+libsndfile))
-$(eval $(call BuildPlugin,snmp,SNMP AgentX Subagent,vanilla,,,,+libnetsnmp))
-$(eval $(call BuildPlugin,snom,SNOM specific features,vanilla,,,,))
-$(eval $(call BuildPlugin,sofia,SOFIA SIP,mod,,,,)) # ~/conf
-$(eval $(call BuildPlugin,sonar,Sonar Ping Timer,vanilla,,,,))
-$(eval $(call BuildPlugin,spandsp,Span DSP,mod,,,,+libjpeg +FS_WITH_LZMA:liblzma @FS_WITH_LZMA +libtiff)) # ~/conf
-$(eval $(call BuildPlugin,spidermonkey,JavaScript,vanilla,,,,@BROKEN)) # fails in js
-#$(eval $(call BuildPlugin,spidermonkey-core_db,JavaScript DB,vanilla,,,,@BROKEN))
-#$(eval $(call BuildPlugin,spidermonkey-curl,JavaScript Curl,vanilla,,,,@BROKEN))
-#$(eval $(call BuildPlugin,spidermonkey-odbc,JavaScript ODBC,vanilla,,,,@BROKEN))
-#$(eval $(call BuildPlugin,spidermonkey-socket,JavaScript Socket,vanilla,,,,@BROKEN))
-#$(eval $(call BuildPlugin,spidermonkey-teletone,JavaScript Teletone,vanilla,,,,@BROKEN))
-$(eval $(call BuildPlugin,spy,User Spy,vanilla,,,,))
-$(eval $(call BuildPlugin,ssml,SSML audio rendering format,mod,,,rayo,))
-$(eval $(call BuildPlugin,stress,Voice Stress Detection,vanilla,,,,))
-$(eval $(call BuildPlugin,syslog,SysLog logger,vanilla,,,,))
-$(eval $(call BuildPlugin,timerfd,Linux Kernel timerfd API,vanilla,,,,))
-$(eval $(call BuildPlugin,tone-stream,Tone Generation Stream,vanilla,,,,))
-$(eval $(call BuildPlugin,translate,Translate,vanilla,,,,))
-$(eval $(call BuildPlugin,tts-commandline,ASR TTS Command Interface,vanilla,,,,))
-#$(eval $(call BuildPlugin,unimrcp,UniMRCP (MRCP Client),vanilla,,,,@BROKEN))
-$(eval $(call BuildPlugin,valet-parking,Valet Parking Application,vanilla,,,,))
-$(eval $(call BuildPlugin,verto,HTML5 Verto interface,vanilla,,,perl rtc,+perl))
-$(eval $(call BuildPlugin,vmd,VoiceMail Beep Detection,vanilla,,,,))
-$(eval $(call BuildPlugin,voicemail,VoiceMail,vanilla,,,,))
-$(eval $(call BuildPlugin,voicemail-ivr,VoiceMail IVR,vanilla,,,,))
-$(eval $(call BuildPlugin,xml-cdr,XML-CDR Handler,vanilla,,,,+libcurl))
-$(eval $(call BuildPlugin,xml-curl,XML-Curl Gateway,vanilla,,,,+libcurl))
-$(eval $(call BuildPlugin,xml-ldap,LDAP-XML Gateway,vanilla,,,,+PACKAGE_$(PKG_NAME)-mod-ldap:libopenldap))
-$(eval $(call BuildPlugin,xml-rpc,XML-RPC Interface,vanilla,,,,))
-$(eval $(call BuildPlugin,xml-radius,Radius authentication and authorization,vanilla,,,,+freeradius3))
-$(eval $(call BuildPlugin,xml-scgi,SCGI XML Gateway,vanilla,,,,))
-$(eval $(call BuildPlugin,yaml,YAML language,vanilla,,,,+libyaml))
diff --git a/net/freeswitch/files/freeswitch.config b/net/freeswitch/files/freeswitch.config
deleted file mode 100644 (file)
index 9b4ab84..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-
-config 'global' 'state'
-       option 'started' '0'
-
-config 'profile_top' 'internal_top'
-
-config 'profile_top' 'external_top'
-
-config 'external_gateway' 'external_example'
-
-
diff --git a/net/freeswitch/files/freeswitch.default b/net/freeswitch/files/freeswitch.default
deleted file mode 100644 (file)
index 079c314..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-#FS_DIR="/opt"
-FS_DIR_ETC="$FS_DIR/etc/freeswitch"
-FS_DIR_MOD="$FS_DIR/usr/lib/freeswitch"
-FS_DIR_DB="$FS_DIR/tmp/freeswitch/db"
-FS_DIR_LOG="$FS_DIR/tmp/freeswitch/log"
-FS_DIR_SCRIPTS="$FS_DIR/usr/share/freeswitch/scripts"
-FS_DIR_HTDOCS="$FS_DIR/usr/share/freeswitch/htdocs"
-FS_DIR_RECORDINGS="/var/lib/freeswitch/recordings" # NOTE: must be changed in config as well
-FS_DIR_VM_STORAGE="/var/lib/freeswitch/storage" # NOTE: must be changed in config as well
-
-OPTIONS="-conf $FS_DIR_ETC -log $FS_DIR_LOG -db $FS_DIR_DB -mod $FS_DIR_MOD -htdocs $FS_DIR_HTDOCS -scripts $FS_DIR_SCRIPTS"
diff --git a/net/freeswitch/files/freeswitch.hotplug b/net/freeswitch/files/freeswitch.hotplug
deleted file mode 100644 (file)
index ef9656c..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-LOAD_STATE=1
-
-if [ "$ACTION" = "ifup" ]; then
-       /etc/init.d/freeswitch enabled && {
-               local not_all_up="$(sh -c '
-                       . /lib/functions.sh
-
-                       LOAD_STATE=1
-                       local if_is_down=0
-                       local network_ignore=""
-                       
-                       check_if_down () {
-                               local cfg="$1"
-                               local up
-                               local proto
-                               config_get_bool up "$1" up 0
-                               config_get proto "$1" proto
-                               if [ "$proto" != "none" ] && [ "$up" -ne 1 ]; then
-                                       local new_down=1
-                                       local oIFS="$IFS"
-                                       local ignore
-                                       IFS=" "
-                                       for ignore in $network_ignore; do
-                                               [ "$cfg" = "$ignore" ] && new_down=0
-                                       done
-                                       IFS="$oIFS"
-                                       [ "$new_down" = "1" ] && if_is_down=1
-                               fi
-                       }
-                       
-                       append_ignore() {
-                               local cfg="$1"
-                               local network
-                               config_get network "$1" network
-                               append network_ignore "$network"
-                       }       
-
-                       LOAD_STATE=1
-                       config_load freeswitch
-                       config_foreach append_ignore network_ignore
-                       config_load network
-                       config_foreach check_if_down interface
-                       
-                       echo "$if_is_down"
-               ')"     
-               [ "$not_all_up" = "0" ] && {
-                       local started
-                       {
-                               mkdir -p /tmp/freeswitch
-                               lock /tmp/freeswitch/.start.lck
-                               config_load freeswitch
-                               config_get started "state" started
-                               [ "$started" != "1" ] && {
-                                       /etc/init.d/freeswitch start
-                                       uci_set_state freeswitch global state started 1
-                               }
-                               lock -u /tmp/freeswitch/.start.lck
-                       } &
-               }
-       }
-fi
-
diff --git a/net/freeswitch/files/freeswitch.init b/net/freeswitch/files/freeswitch.init
deleted file mode 100644 (file)
index 9329cfe..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
-START=90 
-
-DEFAULT=/etc/default/freeswitch
-OPTIONS=""
-
-#boot() {
-#      # Do nothing on boot
-#      exit 0
-#}
-
-start() {
-       [ -f $DEFAULT ] && . $DEFAULT
-       mkdir -p $FS_DIR_DB
-       mkdir -p $FS_DIR_LOG
-       mkdir -p $FS_DIR_RECORDINGS
-       mkdir -p $FS_DIR_VM_STORAGE
-       ulimit -s 240
-       $FS_DIR/usr/bin/freeswitch $OPTIONS -nc
-}
-
-stop() {
-       [ -f $DEFAULT ] && . $DEFAULT
-       $FS_DIR/usr/bin/freeswitch $OPTIONS -stop
-}
-
-restart() {
-       # stopping freeswitch is non-blocking, so we wait until freeswitch's 
-       # event socket is down, and then wait an additional ten seconds so that 
-       # freeswitch should be completely shutdown before we start it again
-       local retval
-       stop
-       fs_cli -x status >/dev/null 2>&1
-       retval=$?
-       while [ $retval -eq 0 ]; do sleep 1; fs_cli -x status >/dev/null 2>&1; retval=$?; done
-       sleep 10
-       start
-}
-
diff --git a/net/freeswitch/patches/glibc/Makefile_am.patch b/net/freeswitch/patches/glibc/Makefile_am.patch
deleted file mode 100644 (file)
index d08c6a1..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -559,7 +559,7 @@ libs/libzrtp/libzrtp.a:
-       cd libs/libzrtp && $(MAKE)
- libs/libvpx/Makefile:
--      cd libs/libvpx && CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --enable-pic --disable-docs --disable-examples --disable-install-bins --disable-install-srcs --disable-unit-tests --extra-cflags="$(VISIBILITY_FLAG)"
-+      cd libs/libvpx && CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CROSS="$(ARCH)-openwrt-linux LD=$(CXX)" ./configure --target=generic-gnu --enable-pic --disable-docs --disable-examples --disable-install-bins --disable-install-srcs --disable-unit-tests --extra-cflags="$(VISIBILITY_FLAG)"
- libs/libvpx/libvpx.a: libs/libvpx/Makefile
-       @cd libs/libvpx && $(MAKE)
diff --git a/net/freeswitch/patches/glibc/build-config-erlang_m4.patch b/net/freeswitch/patches/glibc/build-config-erlang_m4.patch
deleted file mode 100644 (file)
index 5d744f7..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
---- a/build/config/erlang.m4
-+++ b/build/config/erlang.m4
-@@ -1,6 +1,6 @@
- AC_DEFUN([CHECK_ERLANG], [
- #
--# Erlang checks for mod_erlang_event
-+# Erlang check
- #
- AC_ARG_WITH(
-       [erlang],
-@@ -20,22 +20,23 @@ then
-               if test ! -x "$with_erlang" ; then
-                       AC_MSG_ERROR([Specified erlang does not exist or is not executable: $with_erlang])
-               fi
--              AC_MSG_RESULT([$with_erlang])
--              AC_SUBST([ERLANG], ["$with_erlang"])
-+              AC_MSG_RESULT(["$with_erlang/bin/erl"])
-+              AC_SUBST([ERL],["$with_erlang/bin/erl"])
-       else
--              AC_PATH_PROG([ERLANG], ["erl"], ["no"], ["$PATH:/usr/bin:/usr/local/bin"])
-+              AC_ERLANG_NEED_ERL(["$with_erlang/bin"])
-       fi
--      if test "$ERLANG" != "no" ; then
-+      if test "$ERL" != "no" ; then
-               AC_MSG_CHECKING([erlang version])
--              ERLANG_VER="`$ERLANG -version 2>&1 | cut -d' ' -f6`"
-+              ERLANG_VER="`$ERL -version 2>&1 | cut -d' ' -f6`"
-               if test -z "$ERLANG_VER" ; then
-                       AC_MSG_ERROR([Unable to detect erlang version])
-+              else
-+                      AC_MSG_RESULT([$ERLANG_VER])
-               fi
--              AC_MSG_RESULT([$ERLANG_VER])
--              ERLANG_LIBDIR=`$ERLANG -noshell -eval 'io:format("~n~s/lib~n", [[code:lib_dir("erl_interface")]]).' -s erlang halt | tail -n 1`
-+              ERLANG_LIBDIR=`$ERL -noshell -eval 'io:format("~n~s/lib~n", [[code:lib_dir("erl_interface")]]).' -s erlang halt | tail -n 1`
-               AC_MSG_CHECKING([erlang libdir])
-               if test -z "`echo $ERLANG_LIBDIR`" ; then
-                       AC_MSG_ERROR([failed])
-@@ -43,9 +44,16 @@ then
-                       ERLANG_LDFLAGS="-L$ERLANG_LIBDIR $ERLANG_LDFLAGS"
-                       LIBS="-L$ERLANG_LIBDIR $LIBS"
-               fi
-+
-+              #
-+              # Don't use the above ERLANG_LDFLAGS
-+              #
-+              ERLANG_LIBDIR="${STAGING_DIR}/usr/lib"
-+              ERLANG_LDFLAGS="-L$ERLANG_LIBDIR"
-+              LIBS="-L$ERLANG_LIBDIR $LIBS"
-               AC_MSG_RESULT([$ERLANG_LIBDIR])
--              ERLANG_INCDIR=`$ERLANG -noshell -eval 'io:format("~n~s/include~n", [[code:lib_dir("erl_interface")]]).' -s erlang halt | tail -n 1`
-+              ERLANG_INCDIR=`$ERL -noshell -eval 'io:format("~n~s/include~n", [[code:lib_dir("erl_interface")]]).' -s erlang halt | tail -n 1`
-               AC_MSG_CHECKING([erlang incdir])
-               if test -z "`echo $ERLANG_INCDIR`" ; then
-                       AC_MSG_ERROR([failed])
-@@ -59,10 +67,11 @@ then
-               ERLANG_LIB="ei"
--              # check liei
-+              # check libei
-               AC_CHECK_LIB([$ERLANG_LIB], [ei_encode_version], [has_libei="yes"], [has_libei="no"])
-               # maybe someday ei will actually expose this?
--              AC_CHECK_LIB([$ERLANG_LIB], [ei_link_unlink], [ERLANG_CFLAGS="$ERLANG_CFLAGS -DEI_LINK_UNLINK"])
-+              # until then, we comment it out
-+              #AC_CHECK_LIB([$ERLANG_LIB], [ei_link_unlink], [ERLANG_CFLAGS="$ERLANG_CFLAGS -DEI_LINK_UNLINK"])
-               if test "$has_libei" = "no" ; then
-                       AS_IF([test "$with_erlang" = "try"],
-@@ -76,7 +85,7 @@ then
-                       )
-               else
-                       ERLANG_LDFLAGS="$ERLANG_LDFLAGS -lei"
--                      AC_MSG_NOTICE([Your erlang seems OK, do not forget to enable mod_erlang_event in modules.conf])
-+                      AC_MSG_NOTICE([Your erlang seems OK. You can now use ErLang in your codes.])
-                       AC_SUBST([ERLANG_CFLAGS],  [$ERLANG_CFLAGS])
-                       AC_SUBST([ERLANG_LDFLAGS], [$ERLANG_LDFLAGS])
-                       AM_CONDITIONAL([HAVE_ERLANG],[true])
-@@ -87,12 +96,12 @@ then
-       else
-               AS_IF([test "$with_erlang" = "try"],
--                      [AC_MSG_WARN([Could not find erlang, mod_erlang_event will not build, use --with-erlang to specify the location])],
-+                      [AC_MSG_WARN([Could not find erlang, codes depend on erlang will not build, use --with-erlang to specify the location])],
-                       [AC_MSG_ERROR([Could not find erlang, use --with-erlang to specify the location])]
-               )
-       fi
- else
--      AC_MSG_WARN([erlang support disabled, building mod_erlang_event will fail!])
-+      AC_MSG_WARN([erlang support disabled!])
- fi
- ])
diff --git a/net/freeswitch/patches/glibc/build-modules_conf_in.patch b/net/freeswitch/patches/glibc/build-modules_conf_in.patch
deleted file mode 100644 (file)
index 8fee317..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/build/modules.conf.in
-+++ b/build/modules.conf.in
-@@ -39,6 +39,7 @@ applications/mod_httapi
- #applications/mod_rad_auth
- #applications/mod_redis
- #applications/mod_rss
-+#applications/mod_skel
- applications/mod_sms
- #applications/mod_sms_flowroute
- #applications/mod_snapshot
diff --git a/net/freeswitch/patches/glibc/build-openwrt_rules.mk.patch b/net/freeswitch/patches/glibc/build-openwrt_rules.mk.patch
deleted file mode 100644 (file)
index 31fb16f..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
---- /dev/null
-+++ b/build/openwrt_rules.mk
-@@ -0,0 +1,7 @@
-+OPENWRT_DIR=$(shell (cd $(BASE)/../../..;pwd))
-+STAGING_PREFIX=$(OPENWRT_DIR)/staging_dir/host
-+STAGING_DIR=$(OPENWRT_DIR)/staging_dir/$(shell (cd $(BASE)/..;basename `pwd`))
-+ARCH="$(shell grep CONFIG_ARCH $(OPENWRT_DIR)/.config|cut -d= -d'"' -f2)"
-+GNU_TARGET_NAME=$(ARCH)-openwrt-linux
-+
-+include $(OPENWRT_DIR)/rules.mk
diff --git a/net/freeswitch/patches/glibc/configure_ac.patch b/net/freeswitch/patches/glibc/configure_ac.patch
deleted file mode 100644 (file)
index 1a1c88c..0000000
+++ /dev/null
@@ -1,178 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -257,9 +257,9 @@ AX_COMPILER_VENDOR
- if test "x${cross_compiling}" = "xyes"; then
-     CC_FOR_BUILD=${CC_FOR_BUILD-gcc}
-     case "$host" in
--       arm*-linux-gnueabi*|arm*-*-linux-gnueabi*)
-+       arm*-linux-gnueabi*|arm*-*-linux-*)
-               # spandsp modem
--              ac_cv_file__dev_ptmx=yes
-+              ac_cv_file__dev_ptmx=no
-               # libjs
-               export ac_cv_va_copy=yes
-               # srtp
-@@ -276,7 +276,7 @@ if test "x${cross_compiling}" = "xyes";
-               export apr_cv_mutex_recursive=yes
-               export ac_cv_func_pthread_rwlock_init=yes
-               export apr_cv_type_rwlock_t=yes
--              export apr_cv_process_shared_works=yes
-+              #export apr_cv_process_shared_works=no
-               export apr_cv_mutex_robust_shared=yes
-        ;;
-     esac
-@@ -419,10 +419,6 @@ elif test "x${ax_cv_c_compiler_vendor}"
-     APR_ADDTO(SWITCH_AM_CFLAGS, -fPIC -ffast-math)
-     APR_ADDTO(SWITCH_AM_CXXFLAGS, -fPIC -ffast-math)
-     AC_SUBST([AM_MOD_AVMD_CXXFLAGS], [-std=gnu99])      # FS-8809, needed for MAP_POPULATE
--    if test "$ac_cv_gcc_supports_w_no_unused_result" = yes; then
--      APR_ADDTO(SWITCH_AM_CFLAGS, -Werror)
--      APR_ADDTO(SWITCH_AM_CFLAGS, -Wno-unused-result)
--    fi
-     if test "$ac_cv_gcc_supports_w_no_misleading_indentation" = yes; then
-       APR_ADDTO(SWITCH_AM_CFLAGS, -Wno-misleading-indentation)
-     fi
-@@ -948,7 +944,6 @@ AC_CHECK_LIB(pthread, pthread_setschedpa
- AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket))
--AC_CHECK_FILE(/dev/ptmx, [AC_DEFINE(HAVE_DEV_PTMX, 1, [Define if you have /dev/ptmx])])
- AC_CHECK_LIB(util, openpty, [AC_DEFINE(HAVE_OPENPTY, 1, [Define if you have openpty()])])
- AC_CHECK_MEMBERS([struct tm.tm_gmtoff],,,[
-@@ -1560,18 +1555,18 @@ AM_CONDITIONAL([HAVE_MYSQL],[test "$foun
- # perl checks
- #
--AC_CHECK_PROG(PERL,perl,[ac_cv_have_perl=yes],[ac_cv_have_perl=no])
--
--# -a "x$ac_cv_have_EXTERN_h" != "xno"
-+AC_CHECK_PROG(PERL,[perl],[yes],[no],[${STAGING_DIR_HOSTPKG}/usr/bin])
-+PERL=$as_dir/$ac_word$ac_exec_ext
--if test "x$ac_cv_have_perl" != "xno"; then
--   PERL=perl
--   PERL_SITEDIR="`$PERL -MConfig -e 'print $Config{archlib}'`"
--   PERL_LIBDIR="-L`$PERL -MConfig -e 'print $Config{archlib}'`/CORE"
--   PERL_LIBS="`$PERL -MConfig -e 'print $Config{libs}'`"
--   PERL_CFLAGS="-w -DMULTIPLICITY `$PERL -MExtUtils::Embed -e ccopts | sed -e 's|-arch x86_64 -arch i386||'` -DEMBED_PERL"
--   PERL_LDFLAGS="`$PERL -MExtUtils::Embed -e ldopts| sed -e 's|-arch x86_64 -arch i386||'`"
--   PERL_INC="`$PERL -MExtUtils::Embed -e perl_inc`"
-+if test "x$ac_cv_prog_PERL" != "xno"; then
-+   PERL_VERSION="`$PERL -e 'print substr($^V, 1)' | cut -d. -f1,2`"
-+   PERL_SITEDIR_LOCAL="`$PERL -MConfig -e 'print $Config{archlibexp}'`"
-+   PERL_SITEDIR="`find ${STAGING_DIR}/usr -name $PERL_VERSION -print`"
-+   PERL_LIBDIR="-L$PERL_SITEDIR/CORE"
-+   PERL_LIBS="`$PERL -MConfig -e 'print $Config{libs}' | sed -e 's|-lnsl ||g;s| -lgdbm_compat||g'`"
-+   PERL_CFLAGS="-w -DMULTIPLICITY -D_REENTRANT -D_GNU_SOURCE -DPERL_USE_SAFE_PUTENV `$PERL -MExtUtils::Embed -e ccopts | sed -e \"s|$PERL_SITEDIR_LOCAL|$PERL_SITEDIR|g;s| -I/usr/local/include||g\"` -DEMBED_PERL"
-+   PERL_LDFLAGS="`$PERL -MExtUtils::Embed -e ldopts| sed -e \"s| $PERL_SITEDIR_LOCAL/auto/NDBM_File/NDBM_File.a||g;s| $PERL_SITEDIR_LOCAL/auto/ODBM_File/ODBM_File.a||g;s|$PERL_SITEDIR_LOCAL|$PERL_SITEDIR|g;s|.a |.so |g;s|-lnsl ||g;s|-lgdbm_compat ||g;s|/usr/local|${STAGING_DIR}/usr|g\"`"
-+   PERL_INC="-I$PERL_SITEDIR/CORE"
-    save_CFLAGS="$CFLAGS"
-    CFLAGS="$PERL_CFLAGS"
-@@ -1581,34 +1576,39 @@ if test "x$ac_cv_have_perl" != "xno"; th
-    save_LDFLAGS="$LDFLAGS"
-    LDFLAGS="$PERL_LDFLAGS"
--   AC_CHECK_LIB([perl], [perl_alloc], ac_cv_use_libperl=yes, ac_cv_use_libperl=no)
-+   AC_CHECK_LIB([perl], [perl_alloc], [ac_cv_use_libperl=yes], [ac_cv_use_libperl=no])
-    LDFLAGS="$save_LDFLAGS"
-+   AC_SUBST(PERL)
-    AC_SUBST(PERL_SITEDIR)
-+   AC_SUBST(PERL_SITEDIR_LOCAL)
-    AC_SUBST(PERL_LIBDIR)
-    AC_SUBST(PERL_LIBS)
-    AC_SUBST(PERL_CFLAGS)
-    AC_SUBST(PERL_LDFLAGS)
-    AC_SUBST(PERL_INC)
-+   AC_SUBST(PERL_VERSION)
- fi
--AM_CONDITIONAL([HAVE_PERL],[test "x$ac_cv_have_perl" != "xno" -a "x$ac_cv_have_EXTERN_h" != "xno" -a "x$ac_cv_use_libperl" != "xno"])
-+AM_CONDITIONAL([HAVE_PERL],[test "x$ac_cv_prog_PERL" = "xyes" -a "x$ac_cv_have_EXTERN_h" = "xyes" -a "x$ac_cv_use_libperl" = "xyes"])
-+#AM_CONDITIONAL([HAVE_PERL],[test "x$ac_cv_prog_PERL" != "xno" -a "x$ac_cv_have_EXTERN_h" != "xno"])
- #
- # php checks
- #
- AC_CHECK_PROG(PHP,php,[ac_cv_have_php=yes],[ac_cv_have_php=no])
--AC_CHECK_PROG(PHP_CONFIG,php-config,[ac_cv_have_php_config=yes],[ac_cv_have_php_config=no])
-+dnl AC_CHECK_PROG(PHP_CONFIG,php-config,[ac_cv_have_php_config=yes],[ac_cv_have_php_config=no],[${STAGING_DIR}/usr/bin])
-+AC_CHECK_PROG(PHP_CONFIG,php7-config,[ac_cv_have_php_config=yes],[ac_cv_have_php_config=no],[${STAGING_DIR}/usr/bin])
- AM_CONDITIONAL([HAVE_PHP],[test "x$ac_cv_have_php" != "xno" -a "x$ac_cv_have_php_config" != "xno"])
- if test "x$ac_cv_have_php" != "xno" -a "x$ac_cv_have_php_config" != "xno"; then
-    PHP=php
--   PHP_CONFIG=php-config
-+   PHP_CONFIG=${STAGING_DIR}/usr/bin/php7-config
-    PHP_LDFLAGS="`$PHP_CONFIG --ldflags`"
-    PHP_LIBS="`$PHP_CONFIG --libs | sed -r 's/ ?-l(bz2|pcre|xml2|gssapi_krb5|krb5|k5crypto|com_err|history|z|readline|gmp|ssl|crypto)//g'`"
-    PHP_EXT_DIR="`$PHP_CONFIG --extension-dir`"
--   PHP_INC_DIR="`$PHP -r 'echo ini_get("include_path");' | cut -d: -f2`"
-+   PHP_INC_DIR="`$PHP_CONFIG --includes | cut -d" " -f1 | cut -dI -f2`"
-    PHP_INI_DIR="`$PHP_CONFIG --configure-options | tr " " "\n" | grep -- --with-config-file-scan-dir | cut -f2 -d=`"
-    PHP_CFLAGS="`$PHP_CONFIG --includes`"
-    AC_SUBST(PHP_LDFLAGS)
-@@ -1623,7 +1623,7 @@ fi
- # Python checks for mod_python
- #
- AC_ARG_WITH(
--      [python],
-+      [python3],
-       [AS_HELP_STRING([--with-python], [Use system provided version of python (default: try)])],
-       [with_python="$withval"],
-       [with_python="try"]
-@@ -1642,17 +1642,18 @@ then
-               AC_MSG_RESULT([$with_python])
-               AC_SUBST([PYTHON], ["$with_python"])
-       else
--              AC_PATH_PROG([PYTHON], ["python"], ["no"], ["$PATH:/usr/bin:/usr/local/bin"])
-+              AC_PATH_PROG([PYTHON], ["python3"], ["no"], ["${STAGING_DIR_HOSTPKG}/bin"])
-       fi
-       if test "$PYTHON" != "no" ; then
-               AC_MSG_CHECKING([python version])
--              PYTHON_VER="`$PYTHON -V 2>&1 | cut -d' ' -f2`"
-+              PYTHON_VER=`$PYTHON -c "import sys; print('%d.%d' % (sys.version_info[[0]], sys.version_info[[1]]))"`
-               if test -z "$PYTHON_VER" ; then
-                       AC_MSG_ERROR([Unable to detect python version])
-               fi
-               AC_MSG_RESULT([$PYTHON_VER])
-+              AC_SUBST([PYTHON_VER], [$PYTHON_VER])
-               AC_MSG_CHECKING([for python distutils])
-               python_result="`$PYTHON -c 'import distutils;' 2>&1`"
-@@ -1666,12 +1667,12 @@ then
-               if test "$python_has_distutils" != "no" ; then
-                       AC_MSG_CHECKING([location of site-packages])
--                      PYTHON_SITE_DIR="`$PYTHON -c 'from distutils import sysconfig; print(sysconfig.get_python_lib(0));'`"
-+                      if test -d "`$PYTHON -c 'from distutils import sysconfig; print(sysconfig.get_python_lib(0));'`" ; then
-+                              PYTHON_SITE_DIR="`$PYTHON -c 'from distutils import sysconfig; print(sysconfig.get_python_lib(0));'`"
--                      if test -z "$PYTHON_SITE_DIR" ; then
--                              AC_MSG_ERROR([Unable to detect python site-packages path])
--                      elif test ! -d "$PYTHON_SITE_DIR" ; then
--                              AC_MSG_ERROR([Path $PYTHON_SITE_DIR returned by python does not exist!])
-+                              if test -z "$PYTHON_SITE_DIR" ; then
-+                                      AC_MSG_ERROR([Unable to detect python site-packages path])
-+                              fi
-                       fi
-                       AC_MSG_RESULT([$PYTHON_SITE_DIR])
-                       AC_SUBST([PYTHON_SITE_DIR], [$PYTHON_SITE_DIR])
-@@ -1679,10 +1680,10 @@ then
-                       #
-                       # python distutils found, get settings from python directly
-                       #
--                      PYTHON_CFLAGS="`$PYTHON -c 'from distutils import sysconfig; flags = [[\"-I\" + sysconfig.get_python_inc(0), \"-I\" + sysconfig.get_python_inc(1), \" \".join(sysconfig.get_config_var(\"CFLAGS\").split())]]; print(\" \".join(flags));' | sed -e 's/-arch i386//g;s/-arch x86_64//g'`"
-+                      PYTHON_CFLAGS="`$PYTHON -c 'from distutils import sysconfig; flags = [[\"-I\" + sysconfig.get_python_inc(0), \"-I\" + sysconfig.get_python_inc(1), \" \".join(sysconfig.get_config_var(\"CFLAGS\").split())]]; print(\" \".join(flags));'`"
-                       PYTHON_LDFLAGS="`$PYTHON -c 'from distutils import sysconfig; libs = sysconfig.get_config_var(\"LIBS\").split() + sysconfig.get_config_var(\"SYSLIBS\").split(); libs.append(\"-lpython\"+sysconfig.get_config_var(\"VERSION\")); print(\" \".join(libs));'`"
-                       PYTHON_LIB="`$PYTHON -c 'from distutils import sysconfig; print(\"python\" + sysconfig.get_config_var(\"VERSION\"));'`"
--                      PYTHON_LIBDIR="`$PYTHON -c 'from distutils import sysconfig; print(sysconfig.get_config_var(\"LIBDIR\"));'`"
-+                      PYTHON_LIBDIR="`$PYTHON -c 'from distutils import sysconfig; print(sysconfig.get_config_var(\"LIBDIR\"));' | sed -e 's|\(^.*\)/staging_dir/hostpkg|/${STAGING_DIR}/usr|g'`"
-                       # handle python being installed into /usr/local
-                       AC_MSG_CHECKING([python libdir])
diff --git a/net/freeswitch/patches/glibc/libs-apr-configure_ac.patch b/net/freeswitch/patches/glibc/libs-apr-configure_ac.patch
deleted file mode 100644 (file)
index 7c0630f..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
---- a/libs/apr/configure.ac
-+++ b/libs/apr/configure.ac
-@@ -1624,38 +1624,7 @@ if test "$threads" = "1"; then
-     APR_CHECK_DEFINE(PTHREAD_PROCESS_SHARED, pthread.h)
-     AC_CHECK_FUNCS(pthread_mutexattr_setpshared)
-     AC_CHECK_LIB(pthread, pthread_setschedparam, [AC_DEFINE(HAVE_PTHREAD_SETSCHEDPARAM, 1, [Define if you have pthread_setschedparam()])])
--
--    # Some systems have setpshared and define PROCESS_SHARED, but don't 
--    # really support PROCESS_SHARED locks.  So, we must validate that we 
--    # can go through the steps without receiving some sort of system error.
--    # Linux and older versions of AIX have this problem.
--    APR_IFALLYES(header:pthread.h define:PTHREAD_PROCESS_SHARED func:pthread_mutexattr_setpshared, [
--      AC_CACHE_CHECK([for working PROCESS_SHARED locks], apr_cv_process_shared_works, [
--      AC_TRY_RUN([
--#include <sys/types.h>
--#include <pthread.h>
--        int main()
--        {
--            pthread_mutex_t mutex;
--            pthread_mutexattr_t attr;
--            if (pthread_mutexattr_init(&attr))
--                exit(1);
--            if (pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_SHARED))
--                exit(2);
--            if (pthread_mutex_init(&mutex, &attr))
--                exit(3);
--            if (pthread_mutexattr_destroy(&attr))
--                exit(4);
--            if (pthread_mutex_destroy(&mutex))
--                exit(5);
--            exit(0);
--        }], [apr_cv_process_shared_works=yes], [apr_cv_process_shared_works=no])])
--      # Override detection of pthread_mutexattr_setpshared
--      ac_cv_func_pthread_mutexattr_setpshared=$apr_cv_process_shared_works])
--
--    if test "$ac_cv_func_pthread_mutexattr_setpshared" = "yes"; then
--        APR_CHECK_PTHREAD_ROBUST_SHARED_MUTEX
--    fi
-+    APR_CHECK_PTHREAD_ROBUST_SHARED_MUTEX
- fi
- # See which lock mechanisms we can support on this system.
-@@ -1956,7 +1925,11 @@ fi
- APR_CHECK_TCP_NODELAY_INHERITED
- APR_CHECK_O_NONBLOCK_INHERITED
--APR_CHECK_TCP_NODELAY_WITH_CORK
-+
-+dnl Check TCP_NODELAY_WITH_CORK ONLY when NOT cross compiling
-+if test "$cross_compiling" != yes; then
-+      APR_CHECK_TCP_NODELAY_WITH_CORK
-+fi
- # Look for a way of corking TCP...
- APR_CHECK_DEFINE(TCP_CORK, netinet/tcp.h)
diff --git a/net/freeswitch/patches/glibc/libs-apr-util-configure_gnu.patch b/net/freeswitch/patches/glibc/libs-apr-util-configure_gnu.patch
deleted file mode 100644 (file)
index b933b3c..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/libs/apr-util/configure.gnu
-+++ b/libs/apr-util/configure.gnu
-@@ -1,4 +1,4 @@
- #! /bin/sh
- srcpath=$(dirname $0 2>/dev/null )  || srcpath="." 
--$srcpath/configure "$@" --with-apr=../apr --disable-shared --with-pic --without-sqlite2 --without-sqlite3 --with-expat=builtin
-+$srcpath/configure "$@" --with-apr=../apr --disable-shared --with-expat=builtin
diff --git a/net/freeswitch/patches/glibc/libs-srtp-configure_ac.patch b/net/freeswitch/patches/glibc/libs-srtp-configure_ac.patch
deleted file mode 100644 (file)
index 56c1691..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/libs/srtp/configure.ac
-+++ b/libs/srtp/configure.ac
-@@ -130,10 +130,6 @@ if test "$enable_kernel_linux" = "yes";
- fi
- AC_MSG_RESULT($enable_kernel_linux)
--dnl Check for /dev/urandom
--AC_CHECK_FILE(/dev/urandom, DEV_URANDOM=/dev/urandom,
--   [AC_CHECK_FILE(/dev/random, DEV_URANDOM=/dev/random)])
--
- dnl Checks for header files.
- AC_HEADER_STDC
- AC_CHECK_HEADERS(stdlib.h)
diff --git a/net/freeswitch/patches/glibc/src-mod-applications-mod_http_cache-conf-autoload_configs-http_cache_conf_xml.patch b/net/freeswitch/patches/glibc/src-mod-applications-mod_http_cache-conf-autoload_configs-http_cache_conf_xml.patch
deleted file mode 100644 (file)
index 27f1b5f..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/src/mod/applications/mod_http_cache/conf/autoload_configs/http_cache.conf.xml
-+++ b/src/mod/applications/mod_http_cache/conf/autoload_configs/http_cache.conf.xml
-@@ -9,9 +9,9 @@
-     <param name="ssl-verifyhost" value="true"/>
-     <param name="ssl-verifypeer" value="true"/>
-     <!-- default is 300 seconds, override here -->
--    <!--param name="connect-timeout" value="300"/-->
-+    <!-- param name="connect-timeout" value="300"/> -->
-     <!-- default is 300 seconds, override here -->
--    <!--param name="download-timeout" value="300"/-->
-+    <!--param name="download-timeout" value="300"/> -->
-   </settings>
-   <profiles>
diff --git a/net/freeswitch/patches/glibc/src-mod-endpoints-mod_sofia-conf-sofia_conf_xml.patch b/net/freeswitch/patches/glibc/src-mod-endpoints-mod_sofia-conf-sofia_conf_xml.patch
deleted file mode 100644 (file)
index 78db028..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/mod/endpoints/mod_sofia/conf/sofia.conf.xml
-+++ b/src/mod/endpoints/mod_sofia/conf/sofia.conf.xml
-@@ -216,7 +216,7 @@
-         <!-- <param name="unregister-on-options-fail" value="true"/> -->
-         <!-- Send an OPTIONS packet to all registered endpoints -->
-         <!--<param name="all-reg-options-ping" value="true"/>-->
--        <!-- Send an OPTIONS packet to NATed registered endpoints. Can be 'true' or 'udp-only
-+        <!-- Send an OPTIONS packet to NATed registered endpoints. Can be 'true' or 'udp-only -->
-         <!--<param name="nat-options-ping" value="true"/>-->
-         <!-- TLS: disabled by default, set to "true" to enable -->
diff --git a/net/freeswitch/patches/glibc/src-mod-endpoints-mod_verto-Makefile_am.patch b/net/freeswitch/patches/glibc/src-mod-endpoints-mod_verto-Makefile_am.patch
deleted file mode 100644 (file)
index acf7216..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/src/mod/endpoints/mod_verto/Makefile.am
-+++ b/src/mod/endpoints/mod_verto/Makefile.am
-@@ -9,19 +9,19 @@ mod_verto_la_LIBADD   = $(switch_builddi
- mod_verto_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
- if HAVE_PERL
--#perldir = $(PERL_SITEDIR)
--noinst_LTLIBRARIES = MCAST.la
-+perldir = /usr/lib/perl5/@PERL_VERSION@/CORE
-+perl_LTLIBRARIES = MCAST.la
- MCAST_la_SOURCES   = mcast/mcast_wrap.cpp mcast/perlxsi.c mcast/mcast.c mcast/mcast_cpp.cpp
- MCAST_la_CFLAGS    = $(CC_CFLAGS) $(CFLAGS) $(SWITCH_AM_CFLAGS) $(PERL_CFLAGS)
- MCAST_la_CXXFLAGS  = $(SWITCH_AM_CXXFLAGS) $(CXXFLAGS) -w $(PERL_INC)
- MCAST_la_CPPFLAGS  = -I$(switch_srcdir)/src/mod/endpoints/mod_verto/mcast
- MCAST_la_LDFLAGS   = -avoid-version -module -no-undefined -shared $(PERL_LDFLAGS)
--#install-data-local: perlmod-install
-+install-data-local: perlmod-install
--#perlmod-install: install-perlLTLIBRARIES
--#     install -d -m 755 $(DESTDIR)$(PERL_SITEDIR)
--#     install -m 755 mcast/MCAST.pm $(DESTDIR)$(PERL_SITEDIR)
-+perlmod-install: install-perlLTLIBRARIES
-+      install -d -m 755 $(DESTDIR)$(perldir)
-+      install -m 755 mcast/MCAST.pm $(DESTDIR)$(perldir)
- endif
- mcast/esl_wrap.cpp:
diff --git a/net/freeswitch/patches/glibc/src-mod-languages-mod_perl-Makefile_am.patch b/net/freeswitch/patches/glibc/src-mod-languages-mod_perl-Makefile_am.patch
deleted file mode 100644 (file)
index fd3f1e5..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
---- a/src/mod/languages/mod_perl/Makefile.am
-+++ b/src/mod/languages/mod_perl/Makefile.am
-@@ -1,29 +1,27 @@
- include $(top_srcdir)/build/modmake.rulesam
- MODNAME=mod_perl
--PERL        = perl
--PERL_LIBDIR =-L`perl -MConfig -e 'print $$Config{archlib}'`/CORE
--PERL_LIBS   =`perl -MConfig -e 'print $$Config{libs}'`
--perldir=$(prefix)/perl
-+perldir = /usr/lib/perl5/@PERL_VERSION@/CORE
- mod_LTLIBRARIES = mod_perl.la
- perl_LTLIBRARIES = freeswitch.la
- mod_perl_la_SOURCES  = mod_perl.c freeswitch_perl.cpp mod_perl_wrap.cpp perlxsi.c
--mod_perl_la_CFLAGS   = $(SWITCH_AM_CFLAGS)
--mod_perl_la_CXXFLAGS = $(SWITCH_AM_CXXFLAGS)
--mod_perl_la_CPPFLAGS = -w -DMULTIPLICITY `$(PERL) -MExtUtils::Embed -e ccopts` -DEMBED_PERL -I$(switch_srcdir)/libs/libteletone/src/ 
-+mod_perl_la_CFLAGS   = $(SWITCH_AM_CFLAGS) @PERL_INC@
-+mod_perl_la_CXXFLAGS = $(SWITCH_AM_CXXFLAGS) @PERL_INC@
-+mod_perl_la_CPPFLAGS = @PERL_CFLAGS@ -I$(switch_srcdir)/libs/libteletone/src/
- mod_perl_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
--mod_perl_la_LDFLAGS  = -avoid-version -module -no-undefined -shared `$(PERL) -MExtUtils::Embed -e ldopts` `$(PERL) -MConfig -e 'print $$Config{libs}'`
-+mod_perl_la_LDFLAGS  = -avoid-version -module -no-undefined -shared @PERL_LDFLAGS@ @PERL_LIBS@
- freeswitch_la_SOURCES = freeswitch_perl.cpp mod_perl_wrap.cpp perlxsi.c
- freeswitch_la_LDFLAGS = -avoid-version -module -no-undefined -shared $(LDFLAGS)
--freeswitch_la_CPPFLAGS = $(SWITCH_AM_CPPFLAGS) -w -DMULTIPLICITY `$(PERL) -MExtUtils::Embed -e ccopts` -DEMBED_PERL -I$(switch_srcdir)/libs/libteletone/src/ 
-+freeswitch_la_CPPFLAGS = $(SWITCH_AM_CPPFLAGS) @PERL_CFLAGS@ -I$(switch_srcdir)/libs/libteletone/src/
-+
- reswig:       swigclean mod_perl_wrap.cpp
- swigclean: clean
-       rm -f mod_perl_wrap.* freeswitch.so freeswitch.pm
- mod_perl_wrap.cpp:
--      swig2.0 -static -shadow -perl5 -c++ -DMULTIPLICITY -I../../../../src/include -o mod_perl_wrap.cpp freeswitch.i
-+      ${STAGING_DIR_HOSTPKG}/bin/swig -static -shadow -perl5 -c++ -DMULTIPLICITY -I../../../../src/include -o mod_perl_wrap.cpp freeswitch.i
-       echo "#include \"mod_perl_extra.c\"" >> mod_perl_wrap.cpp
-       patch -s -p0 -i hack.diff
-@@ -31,7 +29,7 @@ orig: mod_perl_wrap.cpp
-       patch -R -s -p0 -i hack.diff
- .perlok:
--      @(${PERL} -V | grep -i usemultiplicity=define >/dev/null && echo Phew, You have the right perl.) \
-+      @(@PERL@ -V | grep -i usemultiplicity=define >/dev/null && echo Phew, You have the right perl.) \
-       || ((echo Sorry, you need to compile perl with threads and multiplicity.&& exit 1))
-       @touch .perlok
diff --git a/net/freeswitch/patches/glibc/src-mod-languages-mod_python-Makefile_am.patch b/net/freeswitch/patches/glibc/src-mod-languages-mod_python-Makefile_am.patch
deleted file mode 100644 (file)
index 185006e..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/mod/languages/mod_python/Makefile.am
-+++ b/src/mod/languages/mod_python/Makefile.am
-@@ -2,7 +2,7 @@ include $(top_srcdir)/build/modmake.rule
- MODNAME=mod_python
- PYMOD=freeswitch
--PYTHON_SITE_DIR=@PYTHON_SITE_DIR@
-+PYTHON_SITE_DIR=/usr/lib/python@PYTHON_VER@/site-packages
- SWIGCFILE=../../../switch_swig.c
- SWIGIFILE=../../../switch_swig.i
-@@ -20,7 +20,7 @@ swigclean: clean
-       rm -f mod_python_wrap.* freeswitch.py
- mod_python_wrap.cpp: mod_python_extra.c hack.diff 
--      swig2.0 -python -c++ -I../../../../src/include -oh mod_python_wrap.h -o mod_python_wrap.cpp mod_python.i
-+      ${STAGING_DIR_HOSTPKG}/bin/swig -python -c++ -I../../../../src/include -oh mod_python_wrap.h -o mod_python_wrap.cpp mod_python.i
-       echo "#include \"mod_python_extra.c\"" >> mod_python_wrap.cpp
-       patch -s -p0 -i hack.diff
diff --git a/net/freeswitch/patches/glibc/src-mod-languages-mod_python-freeswitch_python_cpp.patch b/net/freeswitch/patches/glibc/src-mod-languages-mod_python-freeswitch_python_cpp.patch
deleted file mode 100644 (file)
index 9d509c8..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/src/mod/languages/mod_python/freeswitch_python.cpp
-+++ b/src/mod/languages/mod_python/freeswitch_python.cpp
-@@ -319,7 +319,12 @@ switch_status_t Session::run_dtmf_callba
-       }
-       if ((pyresult = PyEval_CallObject(cb_function, arglist))) {
-+#if PY_MAJOR_VERSION < 3
-               str = (char *) PyString_AsString(pyresult);
-+#else
-+              //str = (char *) pyresult->encode('UTF-8');
-+              str = (char *) PyUnicode_AsUnicode(pyresult);
-+#endif
-       } else {
-               PyErr_Print();
-       }
diff --git a/net/freeswitch/patches/musl/Makefile_am.patch b/net/freeswitch/patches/musl/Makefile_am.patch
deleted file mode 100644 (file)
index d08c6a1..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -559,7 +559,7 @@ libs/libzrtp/libzrtp.a:
-       cd libs/libzrtp && $(MAKE)
- libs/libvpx/Makefile:
--      cd libs/libvpx && CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --enable-pic --disable-docs --disable-examples --disable-install-bins --disable-install-srcs --disable-unit-tests --extra-cflags="$(VISIBILITY_FLAG)"
-+      cd libs/libvpx && CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CROSS="$(ARCH)-openwrt-linux LD=$(CXX)" ./configure --target=generic-gnu --enable-pic --disable-docs --disable-examples --disable-install-bins --disable-install-srcs --disable-unit-tests --extra-cflags="$(VISIBILITY_FLAG)"
- libs/libvpx/libvpx.a: libs/libvpx/Makefile
-       @cd libs/libvpx && $(MAKE)
diff --git a/net/freeswitch/patches/musl/build-config-erlang_m4.patch b/net/freeswitch/patches/musl/build-config-erlang_m4.patch
deleted file mode 100644 (file)
index 5d744f7..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
---- a/build/config/erlang.m4
-+++ b/build/config/erlang.m4
-@@ -1,6 +1,6 @@
- AC_DEFUN([CHECK_ERLANG], [
- #
--# Erlang checks for mod_erlang_event
-+# Erlang check
- #
- AC_ARG_WITH(
-       [erlang],
-@@ -20,22 +20,23 @@ then
-               if test ! -x "$with_erlang" ; then
-                       AC_MSG_ERROR([Specified erlang does not exist or is not executable: $with_erlang])
-               fi
--              AC_MSG_RESULT([$with_erlang])
--              AC_SUBST([ERLANG], ["$with_erlang"])
-+              AC_MSG_RESULT(["$with_erlang/bin/erl"])
-+              AC_SUBST([ERL],["$with_erlang/bin/erl"])
-       else
--              AC_PATH_PROG([ERLANG], ["erl"], ["no"], ["$PATH:/usr/bin:/usr/local/bin"])
-+              AC_ERLANG_NEED_ERL(["$with_erlang/bin"])
-       fi
--      if test "$ERLANG" != "no" ; then
-+      if test "$ERL" != "no" ; then
-               AC_MSG_CHECKING([erlang version])
--              ERLANG_VER="`$ERLANG -version 2>&1 | cut -d' ' -f6`"
-+              ERLANG_VER="`$ERL -version 2>&1 | cut -d' ' -f6`"
-               if test -z "$ERLANG_VER" ; then
-                       AC_MSG_ERROR([Unable to detect erlang version])
-+              else
-+                      AC_MSG_RESULT([$ERLANG_VER])
-               fi
--              AC_MSG_RESULT([$ERLANG_VER])
--              ERLANG_LIBDIR=`$ERLANG -noshell -eval 'io:format("~n~s/lib~n", [[code:lib_dir("erl_interface")]]).' -s erlang halt | tail -n 1`
-+              ERLANG_LIBDIR=`$ERL -noshell -eval 'io:format("~n~s/lib~n", [[code:lib_dir("erl_interface")]]).' -s erlang halt | tail -n 1`
-               AC_MSG_CHECKING([erlang libdir])
-               if test -z "`echo $ERLANG_LIBDIR`" ; then
-                       AC_MSG_ERROR([failed])
-@@ -43,9 +44,16 @@ then
-                       ERLANG_LDFLAGS="-L$ERLANG_LIBDIR $ERLANG_LDFLAGS"
-                       LIBS="-L$ERLANG_LIBDIR $LIBS"
-               fi
-+
-+              #
-+              # Don't use the above ERLANG_LDFLAGS
-+              #
-+              ERLANG_LIBDIR="${STAGING_DIR}/usr/lib"
-+              ERLANG_LDFLAGS="-L$ERLANG_LIBDIR"
-+              LIBS="-L$ERLANG_LIBDIR $LIBS"
-               AC_MSG_RESULT([$ERLANG_LIBDIR])
--              ERLANG_INCDIR=`$ERLANG -noshell -eval 'io:format("~n~s/include~n", [[code:lib_dir("erl_interface")]]).' -s erlang halt | tail -n 1`
-+              ERLANG_INCDIR=`$ERL -noshell -eval 'io:format("~n~s/include~n", [[code:lib_dir("erl_interface")]]).' -s erlang halt | tail -n 1`
-               AC_MSG_CHECKING([erlang incdir])
-               if test -z "`echo $ERLANG_INCDIR`" ; then
-                       AC_MSG_ERROR([failed])
-@@ -59,10 +67,11 @@ then
-               ERLANG_LIB="ei"
--              # check liei
-+              # check libei
-               AC_CHECK_LIB([$ERLANG_LIB], [ei_encode_version], [has_libei="yes"], [has_libei="no"])
-               # maybe someday ei will actually expose this?
--              AC_CHECK_LIB([$ERLANG_LIB], [ei_link_unlink], [ERLANG_CFLAGS="$ERLANG_CFLAGS -DEI_LINK_UNLINK"])
-+              # until then, we comment it out
-+              #AC_CHECK_LIB([$ERLANG_LIB], [ei_link_unlink], [ERLANG_CFLAGS="$ERLANG_CFLAGS -DEI_LINK_UNLINK"])
-               if test "$has_libei" = "no" ; then
-                       AS_IF([test "$with_erlang" = "try"],
-@@ -76,7 +85,7 @@ then
-                       )
-               else
-                       ERLANG_LDFLAGS="$ERLANG_LDFLAGS -lei"
--                      AC_MSG_NOTICE([Your erlang seems OK, do not forget to enable mod_erlang_event in modules.conf])
-+                      AC_MSG_NOTICE([Your erlang seems OK. You can now use ErLang in your codes.])
-                       AC_SUBST([ERLANG_CFLAGS],  [$ERLANG_CFLAGS])
-                       AC_SUBST([ERLANG_LDFLAGS], [$ERLANG_LDFLAGS])
-                       AM_CONDITIONAL([HAVE_ERLANG],[true])
-@@ -87,12 +96,12 @@ then
-       else
-               AS_IF([test "$with_erlang" = "try"],
--                      [AC_MSG_WARN([Could not find erlang, mod_erlang_event will not build, use --with-erlang to specify the location])],
-+                      [AC_MSG_WARN([Could not find erlang, codes depend on erlang will not build, use --with-erlang to specify the location])],
-                       [AC_MSG_ERROR([Could not find erlang, use --with-erlang to specify the location])]
-               )
-       fi
- else
--      AC_MSG_WARN([erlang support disabled, building mod_erlang_event will fail!])
-+      AC_MSG_WARN([erlang support disabled!])
- fi
- ])
diff --git a/net/freeswitch/patches/musl/build-modules_conf_in.patch b/net/freeswitch/patches/musl/build-modules_conf_in.patch
deleted file mode 100644 (file)
index 8fee317..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/build/modules.conf.in
-+++ b/build/modules.conf.in
-@@ -39,6 +39,7 @@ applications/mod_httapi
- #applications/mod_rad_auth
- #applications/mod_redis
- #applications/mod_rss
-+#applications/mod_skel
- applications/mod_sms
- #applications/mod_sms_flowroute
- #applications/mod_snapshot
diff --git a/net/freeswitch/patches/musl/build-openwrt_rules.mk.patch b/net/freeswitch/patches/musl/build-openwrt_rules.mk.patch
deleted file mode 100644 (file)
index 31fb16f..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
---- /dev/null
-+++ b/build/openwrt_rules.mk
-@@ -0,0 +1,7 @@
-+OPENWRT_DIR=$(shell (cd $(BASE)/../../..;pwd))
-+STAGING_PREFIX=$(OPENWRT_DIR)/staging_dir/host
-+STAGING_DIR=$(OPENWRT_DIR)/staging_dir/$(shell (cd $(BASE)/..;basename `pwd`))
-+ARCH="$(shell grep CONFIG_ARCH $(OPENWRT_DIR)/.config|cut -d= -d'"' -f2)"
-+GNU_TARGET_NAME=$(ARCH)-openwrt-linux
-+
-+include $(OPENWRT_DIR)/rules.mk
diff --git a/net/freeswitch/patches/musl/configure_ac.patch b/net/freeswitch/patches/musl/configure_ac.patch
deleted file mode 100644 (file)
index 1a1c88c..0000000
+++ /dev/null
@@ -1,178 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -257,9 +257,9 @@ AX_COMPILER_VENDOR
- if test "x${cross_compiling}" = "xyes"; then
-     CC_FOR_BUILD=${CC_FOR_BUILD-gcc}
-     case "$host" in
--       arm*-linux-gnueabi*|arm*-*-linux-gnueabi*)
-+       arm*-linux-gnueabi*|arm*-*-linux-*)
-               # spandsp modem
--              ac_cv_file__dev_ptmx=yes
-+              ac_cv_file__dev_ptmx=no
-               # libjs
-               export ac_cv_va_copy=yes
-               # srtp
-@@ -276,7 +276,7 @@ if test "x${cross_compiling}" = "xyes";
-               export apr_cv_mutex_recursive=yes
-               export ac_cv_func_pthread_rwlock_init=yes
-               export apr_cv_type_rwlock_t=yes
--              export apr_cv_process_shared_works=yes
-+              #export apr_cv_process_shared_works=no
-               export apr_cv_mutex_robust_shared=yes
-        ;;
-     esac
-@@ -419,10 +419,6 @@ elif test "x${ax_cv_c_compiler_vendor}"
-     APR_ADDTO(SWITCH_AM_CFLAGS, -fPIC -ffast-math)
-     APR_ADDTO(SWITCH_AM_CXXFLAGS, -fPIC -ffast-math)
-     AC_SUBST([AM_MOD_AVMD_CXXFLAGS], [-std=gnu99])      # FS-8809, needed for MAP_POPULATE
--    if test "$ac_cv_gcc_supports_w_no_unused_result" = yes; then
--      APR_ADDTO(SWITCH_AM_CFLAGS, -Werror)
--      APR_ADDTO(SWITCH_AM_CFLAGS, -Wno-unused-result)
--    fi
-     if test "$ac_cv_gcc_supports_w_no_misleading_indentation" = yes; then
-       APR_ADDTO(SWITCH_AM_CFLAGS, -Wno-misleading-indentation)
-     fi
-@@ -948,7 +944,6 @@ AC_CHECK_LIB(pthread, pthread_setschedpa
- AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket))
--AC_CHECK_FILE(/dev/ptmx, [AC_DEFINE(HAVE_DEV_PTMX, 1, [Define if you have /dev/ptmx])])
- AC_CHECK_LIB(util, openpty, [AC_DEFINE(HAVE_OPENPTY, 1, [Define if you have openpty()])])
- AC_CHECK_MEMBERS([struct tm.tm_gmtoff],,,[
-@@ -1560,18 +1555,18 @@ AM_CONDITIONAL([HAVE_MYSQL],[test "$foun
- # perl checks
- #
--AC_CHECK_PROG(PERL,perl,[ac_cv_have_perl=yes],[ac_cv_have_perl=no])
--
--# -a "x$ac_cv_have_EXTERN_h" != "xno"
-+AC_CHECK_PROG(PERL,[perl],[yes],[no],[${STAGING_DIR_HOSTPKG}/usr/bin])
-+PERL=$as_dir/$ac_word$ac_exec_ext
--if test "x$ac_cv_have_perl" != "xno"; then
--   PERL=perl
--   PERL_SITEDIR="`$PERL -MConfig -e 'print $Config{archlib}'`"
--   PERL_LIBDIR="-L`$PERL -MConfig -e 'print $Config{archlib}'`/CORE"
--   PERL_LIBS="`$PERL -MConfig -e 'print $Config{libs}'`"
--   PERL_CFLAGS="-w -DMULTIPLICITY `$PERL -MExtUtils::Embed -e ccopts | sed -e 's|-arch x86_64 -arch i386||'` -DEMBED_PERL"
--   PERL_LDFLAGS="`$PERL -MExtUtils::Embed -e ldopts| sed -e 's|-arch x86_64 -arch i386||'`"
--   PERL_INC="`$PERL -MExtUtils::Embed -e perl_inc`"
-+if test "x$ac_cv_prog_PERL" != "xno"; then
-+   PERL_VERSION="`$PERL -e 'print substr($^V, 1)' | cut -d. -f1,2`"
-+   PERL_SITEDIR_LOCAL="`$PERL -MConfig -e 'print $Config{archlibexp}'`"
-+   PERL_SITEDIR="`find ${STAGING_DIR}/usr -name $PERL_VERSION -print`"
-+   PERL_LIBDIR="-L$PERL_SITEDIR/CORE"
-+   PERL_LIBS="`$PERL -MConfig -e 'print $Config{libs}' | sed -e 's|-lnsl ||g;s| -lgdbm_compat||g'`"
-+   PERL_CFLAGS="-w -DMULTIPLICITY -D_REENTRANT -D_GNU_SOURCE -DPERL_USE_SAFE_PUTENV `$PERL -MExtUtils::Embed -e ccopts | sed -e \"s|$PERL_SITEDIR_LOCAL|$PERL_SITEDIR|g;s| -I/usr/local/include||g\"` -DEMBED_PERL"
-+   PERL_LDFLAGS="`$PERL -MExtUtils::Embed -e ldopts| sed -e \"s| $PERL_SITEDIR_LOCAL/auto/NDBM_File/NDBM_File.a||g;s| $PERL_SITEDIR_LOCAL/auto/ODBM_File/ODBM_File.a||g;s|$PERL_SITEDIR_LOCAL|$PERL_SITEDIR|g;s|.a |.so |g;s|-lnsl ||g;s|-lgdbm_compat ||g;s|/usr/local|${STAGING_DIR}/usr|g\"`"
-+   PERL_INC="-I$PERL_SITEDIR/CORE"
-    save_CFLAGS="$CFLAGS"
-    CFLAGS="$PERL_CFLAGS"
-@@ -1581,34 +1576,39 @@ if test "x$ac_cv_have_perl" != "xno"; th
-    save_LDFLAGS="$LDFLAGS"
-    LDFLAGS="$PERL_LDFLAGS"
--   AC_CHECK_LIB([perl], [perl_alloc], ac_cv_use_libperl=yes, ac_cv_use_libperl=no)
-+   AC_CHECK_LIB([perl], [perl_alloc], [ac_cv_use_libperl=yes], [ac_cv_use_libperl=no])
-    LDFLAGS="$save_LDFLAGS"
-+   AC_SUBST(PERL)
-    AC_SUBST(PERL_SITEDIR)
-+   AC_SUBST(PERL_SITEDIR_LOCAL)
-    AC_SUBST(PERL_LIBDIR)
-    AC_SUBST(PERL_LIBS)
-    AC_SUBST(PERL_CFLAGS)
-    AC_SUBST(PERL_LDFLAGS)
-    AC_SUBST(PERL_INC)
-+   AC_SUBST(PERL_VERSION)
- fi
--AM_CONDITIONAL([HAVE_PERL],[test "x$ac_cv_have_perl" != "xno" -a "x$ac_cv_have_EXTERN_h" != "xno" -a "x$ac_cv_use_libperl" != "xno"])
-+AM_CONDITIONAL([HAVE_PERL],[test "x$ac_cv_prog_PERL" = "xyes" -a "x$ac_cv_have_EXTERN_h" = "xyes" -a "x$ac_cv_use_libperl" = "xyes"])
-+#AM_CONDITIONAL([HAVE_PERL],[test "x$ac_cv_prog_PERL" != "xno" -a "x$ac_cv_have_EXTERN_h" != "xno"])
- #
- # php checks
- #
- AC_CHECK_PROG(PHP,php,[ac_cv_have_php=yes],[ac_cv_have_php=no])
--AC_CHECK_PROG(PHP_CONFIG,php-config,[ac_cv_have_php_config=yes],[ac_cv_have_php_config=no])
-+dnl AC_CHECK_PROG(PHP_CONFIG,php-config,[ac_cv_have_php_config=yes],[ac_cv_have_php_config=no],[${STAGING_DIR}/usr/bin])
-+AC_CHECK_PROG(PHP_CONFIG,php7-config,[ac_cv_have_php_config=yes],[ac_cv_have_php_config=no],[${STAGING_DIR}/usr/bin])
- AM_CONDITIONAL([HAVE_PHP],[test "x$ac_cv_have_php" != "xno" -a "x$ac_cv_have_php_config" != "xno"])
- if test "x$ac_cv_have_php" != "xno" -a "x$ac_cv_have_php_config" != "xno"; then
-    PHP=php
--   PHP_CONFIG=php-config
-+   PHP_CONFIG=${STAGING_DIR}/usr/bin/php7-config
-    PHP_LDFLAGS="`$PHP_CONFIG --ldflags`"
-    PHP_LIBS="`$PHP_CONFIG --libs | sed -r 's/ ?-l(bz2|pcre|xml2|gssapi_krb5|krb5|k5crypto|com_err|history|z|readline|gmp|ssl|crypto)//g'`"
-    PHP_EXT_DIR="`$PHP_CONFIG --extension-dir`"
--   PHP_INC_DIR="`$PHP -r 'echo ini_get("include_path");' | cut -d: -f2`"
-+   PHP_INC_DIR="`$PHP_CONFIG --includes | cut -d" " -f1 | cut -dI -f2`"
-    PHP_INI_DIR="`$PHP_CONFIG --configure-options | tr " " "\n" | grep -- --with-config-file-scan-dir | cut -f2 -d=`"
-    PHP_CFLAGS="`$PHP_CONFIG --includes`"
-    AC_SUBST(PHP_LDFLAGS)
-@@ -1623,7 +1623,7 @@ fi
- # Python checks for mod_python
- #
- AC_ARG_WITH(
--      [python],
-+      [python3],
-       [AS_HELP_STRING([--with-python], [Use system provided version of python (default: try)])],
-       [with_python="$withval"],
-       [with_python="try"]
-@@ -1642,17 +1642,18 @@ then
-               AC_MSG_RESULT([$with_python])
-               AC_SUBST([PYTHON], ["$with_python"])
-       else
--              AC_PATH_PROG([PYTHON], ["python"], ["no"], ["$PATH:/usr/bin:/usr/local/bin"])
-+              AC_PATH_PROG([PYTHON], ["python3"], ["no"], ["${STAGING_DIR_HOSTPKG}/bin"])
-       fi
-       if test "$PYTHON" != "no" ; then
-               AC_MSG_CHECKING([python version])
--              PYTHON_VER="`$PYTHON -V 2>&1 | cut -d' ' -f2`"
-+              PYTHON_VER=`$PYTHON -c "import sys; print('%d.%d' % (sys.version_info[[0]], sys.version_info[[1]]))"`
-               if test -z "$PYTHON_VER" ; then
-                       AC_MSG_ERROR([Unable to detect python version])
-               fi
-               AC_MSG_RESULT([$PYTHON_VER])
-+              AC_SUBST([PYTHON_VER], [$PYTHON_VER])
-               AC_MSG_CHECKING([for python distutils])
-               python_result="`$PYTHON -c 'import distutils;' 2>&1`"
-@@ -1666,12 +1667,12 @@ then
-               if test "$python_has_distutils" != "no" ; then
-                       AC_MSG_CHECKING([location of site-packages])
--                      PYTHON_SITE_DIR="`$PYTHON -c 'from distutils import sysconfig; print(sysconfig.get_python_lib(0));'`"
-+                      if test -d "`$PYTHON -c 'from distutils import sysconfig; print(sysconfig.get_python_lib(0));'`" ; then
-+                              PYTHON_SITE_DIR="`$PYTHON -c 'from distutils import sysconfig; print(sysconfig.get_python_lib(0));'`"
--                      if test -z "$PYTHON_SITE_DIR" ; then
--                              AC_MSG_ERROR([Unable to detect python site-packages path])
--                      elif test ! -d "$PYTHON_SITE_DIR" ; then
--                              AC_MSG_ERROR([Path $PYTHON_SITE_DIR returned by python does not exist!])
-+                              if test -z "$PYTHON_SITE_DIR" ; then
-+                                      AC_MSG_ERROR([Unable to detect python site-packages path])
-+                              fi
-                       fi
-                       AC_MSG_RESULT([$PYTHON_SITE_DIR])
-                       AC_SUBST([PYTHON_SITE_DIR], [$PYTHON_SITE_DIR])
-@@ -1679,10 +1680,10 @@ then
-                       #
-                       # python distutils found, get settings from python directly
-                       #
--                      PYTHON_CFLAGS="`$PYTHON -c 'from distutils import sysconfig; flags = [[\"-I\" + sysconfig.get_python_inc(0), \"-I\" + sysconfig.get_python_inc(1), \" \".join(sysconfig.get_config_var(\"CFLAGS\").split())]]; print(\" \".join(flags));' | sed -e 's/-arch i386//g;s/-arch x86_64//g'`"
-+                      PYTHON_CFLAGS="`$PYTHON -c 'from distutils import sysconfig; flags = [[\"-I\" + sysconfig.get_python_inc(0), \"-I\" + sysconfig.get_python_inc(1), \" \".join(sysconfig.get_config_var(\"CFLAGS\").split())]]; print(\" \".join(flags));'`"
-                       PYTHON_LDFLAGS="`$PYTHON -c 'from distutils import sysconfig; libs = sysconfig.get_config_var(\"LIBS\").split() + sysconfig.get_config_var(\"SYSLIBS\").split(); libs.append(\"-lpython\"+sysconfig.get_config_var(\"VERSION\")); print(\" \".join(libs));'`"
-                       PYTHON_LIB="`$PYTHON -c 'from distutils import sysconfig; print(\"python\" + sysconfig.get_config_var(\"VERSION\"));'`"
--                      PYTHON_LIBDIR="`$PYTHON -c 'from distutils import sysconfig; print(sysconfig.get_config_var(\"LIBDIR\"));'`"
-+                      PYTHON_LIBDIR="`$PYTHON -c 'from distutils import sysconfig; print(sysconfig.get_config_var(\"LIBDIR\"));' | sed -e 's|\(^.*\)/staging_dir/hostpkg|/${STAGING_DIR}/usr|g'`"
-                       # handle python being installed into /usr/local
-                       AC_MSG_CHECKING([python libdir])
diff --git a/net/freeswitch/patches/musl/libs-apr-configure_ac.patch b/net/freeswitch/patches/musl/libs-apr-configure_ac.patch
deleted file mode 100644 (file)
index 7c0630f..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
---- a/libs/apr/configure.ac
-+++ b/libs/apr/configure.ac
-@@ -1624,38 +1624,7 @@ if test "$threads" = "1"; then
-     APR_CHECK_DEFINE(PTHREAD_PROCESS_SHARED, pthread.h)
-     AC_CHECK_FUNCS(pthread_mutexattr_setpshared)
-     AC_CHECK_LIB(pthread, pthread_setschedparam, [AC_DEFINE(HAVE_PTHREAD_SETSCHEDPARAM, 1, [Define if you have pthread_setschedparam()])])
--
--    # Some systems have setpshared and define PROCESS_SHARED, but don't 
--    # really support PROCESS_SHARED locks.  So, we must validate that we 
--    # can go through the steps without receiving some sort of system error.
--    # Linux and older versions of AIX have this problem.
--    APR_IFALLYES(header:pthread.h define:PTHREAD_PROCESS_SHARED func:pthread_mutexattr_setpshared, [
--      AC_CACHE_CHECK([for working PROCESS_SHARED locks], apr_cv_process_shared_works, [
--      AC_TRY_RUN([
--#include <sys/types.h>
--#include <pthread.h>
--        int main()
--        {
--            pthread_mutex_t mutex;
--            pthread_mutexattr_t attr;
--            if (pthread_mutexattr_init(&attr))
--                exit(1);
--            if (pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_SHARED))
--                exit(2);
--            if (pthread_mutex_init(&mutex, &attr))
--                exit(3);
--            if (pthread_mutexattr_destroy(&attr))
--                exit(4);
--            if (pthread_mutex_destroy(&mutex))
--                exit(5);
--            exit(0);
--        }], [apr_cv_process_shared_works=yes], [apr_cv_process_shared_works=no])])
--      # Override detection of pthread_mutexattr_setpshared
--      ac_cv_func_pthread_mutexattr_setpshared=$apr_cv_process_shared_works])
--
--    if test "$ac_cv_func_pthread_mutexattr_setpshared" = "yes"; then
--        APR_CHECK_PTHREAD_ROBUST_SHARED_MUTEX
--    fi
-+    APR_CHECK_PTHREAD_ROBUST_SHARED_MUTEX
- fi
- # See which lock mechanisms we can support on this system.
-@@ -1956,7 +1925,11 @@ fi
- APR_CHECK_TCP_NODELAY_INHERITED
- APR_CHECK_O_NONBLOCK_INHERITED
--APR_CHECK_TCP_NODELAY_WITH_CORK
-+
-+dnl Check TCP_NODELAY_WITH_CORK ONLY when NOT cross compiling
-+if test "$cross_compiling" != yes; then
-+      APR_CHECK_TCP_NODELAY_WITH_CORK
-+fi
- # Look for a way of corking TCP...
- APR_CHECK_DEFINE(TCP_CORK, netinet/tcp.h)
diff --git a/net/freeswitch/patches/musl/libs-apr-util-configure_gnu.patch b/net/freeswitch/patches/musl/libs-apr-util-configure_gnu.patch
deleted file mode 100644 (file)
index b933b3c..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/libs/apr-util/configure.gnu
-+++ b/libs/apr-util/configure.gnu
-@@ -1,4 +1,4 @@
- #! /bin/sh
- srcpath=$(dirname $0 2>/dev/null )  || srcpath="." 
--$srcpath/configure "$@" --with-apr=../apr --disable-shared --with-pic --without-sqlite2 --without-sqlite3 --with-expat=builtin
-+$srcpath/configure "$@" --with-apr=../apr --disable-shared --with-expat=builtin
diff --git a/net/freeswitch/patches/musl/libs-srtp-configure_ac.patch b/net/freeswitch/patches/musl/libs-srtp-configure_ac.patch
deleted file mode 100644 (file)
index 56c1691..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/libs/srtp/configure.ac
-+++ b/libs/srtp/configure.ac
-@@ -130,10 +130,6 @@ if test "$enable_kernel_linux" = "yes";
- fi
- AC_MSG_RESULT($enable_kernel_linux)
--dnl Check for /dev/urandom
--AC_CHECK_FILE(/dev/urandom, DEV_URANDOM=/dev/urandom,
--   [AC_CHECK_FILE(/dev/random, DEV_URANDOM=/dev/random)])
--
- dnl Checks for header files.
- AC_HEADER_STDC
- AC_CHECK_HEADERS(stdlib.h)
diff --git a/net/freeswitch/patches/musl/src-mod-applications-mod_http_cache-conf-autoload_configs-http_cache_conf_xml.patch b/net/freeswitch/patches/musl/src-mod-applications-mod_http_cache-conf-autoload_configs-http_cache_conf_xml.patch
deleted file mode 100644 (file)
index 27f1b5f..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/src/mod/applications/mod_http_cache/conf/autoload_configs/http_cache.conf.xml
-+++ b/src/mod/applications/mod_http_cache/conf/autoload_configs/http_cache.conf.xml
-@@ -9,9 +9,9 @@
-     <param name="ssl-verifyhost" value="true"/>
-     <param name="ssl-verifypeer" value="true"/>
-     <!-- default is 300 seconds, override here -->
--    <!--param name="connect-timeout" value="300"/-->
-+    <!-- param name="connect-timeout" value="300"/> -->
-     <!-- default is 300 seconds, override here -->
--    <!--param name="download-timeout" value="300"/-->
-+    <!--param name="download-timeout" value="300"/> -->
-   </settings>
-   <profiles>
diff --git a/net/freeswitch/patches/musl/src-mod-endpoints-mod_sofia-conf-sofia_conf_xml.patch b/net/freeswitch/patches/musl/src-mod-endpoints-mod_sofia-conf-sofia_conf_xml.patch
deleted file mode 100644 (file)
index 78db028..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/mod/endpoints/mod_sofia/conf/sofia.conf.xml
-+++ b/src/mod/endpoints/mod_sofia/conf/sofia.conf.xml
-@@ -216,7 +216,7 @@
-         <!-- <param name="unregister-on-options-fail" value="true"/> -->
-         <!-- Send an OPTIONS packet to all registered endpoints -->
-         <!--<param name="all-reg-options-ping" value="true"/>-->
--        <!-- Send an OPTIONS packet to NATed registered endpoints. Can be 'true' or 'udp-only
-+        <!-- Send an OPTIONS packet to NATed registered endpoints. Can be 'true' or 'udp-only -->
-         <!--<param name="nat-options-ping" value="true"/>-->
-         <!-- TLS: disabled by default, set to "true" to enable -->
diff --git a/net/freeswitch/patches/musl/src-mod-endpoints-mod_verto-Makefile_am.patch b/net/freeswitch/patches/musl/src-mod-endpoints-mod_verto-Makefile_am.patch
deleted file mode 100644 (file)
index acf7216..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/src/mod/endpoints/mod_verto/Makefile.am
-+++ b/src/mod/endpoints/mod_verto/Makefile.am
-@@ -9,19 +9,19 @@ mod_verto_la_LIBADD   = $(switch_builddi
- mod_verto_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
- if HAVE_PERL
--#perldir = $(PERL_SITEDIR)
--noinst_LTLIBRARIES = MCAST.la
-+perldir = /usr/lib/perl5/@PERL_VERSION@/CORE
-+perl_LTLIBRARIES = MCAST.la
- MCAST_la_SOURCES   = mcast/mcast_wrap.cpp mcast/perlxsi.c mcast/mcast.c mcast/mcast_cpp.cpp
- MCAST_la_CFLAGS    = $(CC_CFLAGS) $(CFLAGS) $(SWITCH_AM_CFLAGS) $(PERL_CFLAGS)
- MCAST_la_CXXFLAGS  = $(SWITCH_AM_CXXFLAGS) $(CXXFLAGS) -w $(PERL_INC)
- MCAST_la_CPPFLAGS  = -I$(switch_srcdir)/src/mod/endpoints/mod_verto/mcast
- MCAST_la_LDFLAGS   = -avoid-version -module -no-undefined -shared $(PERL_LDFLAGS)
--#install-data-local: perlmod-install
-+install-data-local: perlmod-install
--#perlmod-install: install-perlLTLIBRARIES
--#     install -d -m 755 $(DESTDIR)$(PERL_SITEDIR)
--#     install -m 755 mcast/MCAST.pm $(DESTDIR)$(PERL_SITEDIR)
-+perlmod-install: install-perlLTLIBRARIES
-+      install -d -m 755 $(DESTDIR)$(perldir)
-+      install -m 755 mcast/MCAST.pm $(DESTDIR)$(perldir)
- endif
- mcast/esl_wrap.cpp:
diff --git a/net/freeswitch/patches/musl/src-mod-languages-mod_perl-Makefile_am.patch b/net/freeswitch/patches/musl/src-mod-languages-mod_perl-Makefile_am.patch
deleted file mode 100644 (file)
index fd3f1e5..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
---- a/src/mod/languages/mod_perl/Makefile.am
-+++ b/src/mod/languages/mod_perl/Makefile.am
-@@ -1,29 +1,27 @@
- include $(top_srcdir)/build/modmake.rulesam
- MODNAME=mod_perl
--PERL        = perl
--PERL_LIBDIR =-L`perl -MConfig -e 'print $$Config{archlib}'`/CORE
--PERL_LIBS   =`perl -MConfig -e 'print $$Config{libs}'`
--perldir=$(prefix)/perl
-+perldir = /usr/lib/perl5/@PERL_VERSION@/CORE
- mod_LTLIBRARIES = mod_perl.la
- perl_LTLIBRARIES = freeswitch.la
- mod_perl_la_SOURCES  = mod_perl.c freeswitch_perl.cpp mod_perl_wrap.cpp perlxsi.c
--mod_perl_la_CFLAGS   = $(SWITCH_AM_CFLAGS)
--mod_perl_la_CXXFLAGS = $(SWITCH_AM_CXXFLAGS)
--mod_perl_la_CPPFLAGS = -w -DMULTIPLICITY `$(PERL) -MExtUtils::Embed -e ccopts` -DEMBED_PERL -I$(switch_srcdir)/libs/libteletone/src/ 
-+mod_perl_la_CFLAGS   = $(SWITCH_AM_CFLAGS) @PERL_INC@
-+mod_perl_la_CXXFLAGS = $(SWITCH_AM_CXXFLAGS) @PERL_INC@
-+mod_perl_la_CPPFLAGS = @PERL_CFLAGS@ -I$(switch_srcdir)/libs/libteletone/src/
- mod_perl_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
--mod_perl_la_LDFLAGS  = -avoid-version -module -no-undefined -shared `$(PERL) -MExtUtils::Embed -e ldopts` `$(PERL) -MConfig -e 'print $$Config{libs}'`
-+mod_perl_la_LDFLAGS  = -avoid-version -module -no-undefined -shared @PERL_LDFLAGS@ @PERL_LIBS@
- freeswitch_la_SOURCES = freeswitch_perl.cpp mod_perl_wrap.cpp perlxsi.c
- freeswitch_la_LDFLAGS = -avoid-version -module -no-undefined -shared $(LDFLAGS)
--freeswitch_la_CPPFLAGS = $(SWITCH_AM_CPPFLAGS) -w -DMULTIPLICITY `$(PERL) -MExtUtils::Embed -e ccopts` -DEMBED_PERL -I$(switch_srcdir)/libs/libteletone/src/ 
-+freeswitch_la_CPPFLAGS = $(SWITCH_AM_CPPFLAGS) @PERL_CFLAGS@ -I$(switch_srcdir)/libs/libteletone/src/
-+
- reswig:       swigclean mod_perl_wrap.cpp
- swigclean: clean
-       rm -f mod_perl_wrap.* freeswitch.so freeswitch.pm
- mod_perl_wrap.cpp:
--      swig2.0 -static -shadow -perl5 -c++ -DMULTIPLICITY -I../../../../src/include -o mod_perl_wrap.cpp freeswitch.i
-+      ${STAGING_DIR_HOSTPKG}/bin/swig -static -shadow -perl5 -c++ -DMULTIPLICITY -I../../../../src/include -o mod_perl_wrap.cpp freeswitch.i
-       echo "#include \"mod_perl_extra.c\"" >> mod_perl_wrap.cpp
-       patch -s -p0 -i hack.diff
-@@ -31,7 +29,7 @@ orig: mod_perl_wrap.cpp
-       patch -R -s -p0 -i hack.diff
- .perlok:
--      @(${PERL} -V | grep -i usemultiplicity=define >/dev/null && echo Phew, You have the right perl.) \
-+      @(@PERL@ -V | grep -i usemultiplicity=define >/dev/null && echo Phew, You have the right perl.) \
-       || ((echo Sorry, you need to compile perl with threads and multiplicity.&& exit 1))
-       @touch .perlok
diff --git a/net/freeswitch/patches/musl/src-mod-languages-mod_python-Makefile_am.patch b/net/freeswitch/patches/musl/src-mod-languages-mod_python-Makefile_am.patch
deleted file mode 100644 (file)
index 185006e..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/mod/languages/mod_python/Makefile.am
-+++ b/src/mod/languages/mod_python/Makefile.am
-@@ -2,7 +2,7 @@ include $(top_srcdir)/build/modmake.rule
- MODNAME=mod_python
- PYMOD=freeswitch
--PYTHON_SITE_DIR=@PYTHON_SITE_DIR@
-+PYTHON_SITE_DIR=/usr/lib/python@PYTHON_VER@/site-packages
- SWIGCFILE=../../../switch_swig.c
- SWIGIFILE=../../../switch_swig.i
-@@ -20,7 +20,7 @@ swigclean: clean
-       rm -f mod_python_wrap.* freeswitch.py
- mod_python_wrap.cpp: mod_python_extra.c hack.diff 
--      swig2.0 -python -c++ -I../../../../src/include -oh mod_python_wrap.h -o mod_python_wrap.cpp mod_python.i
-+      ${STAGING_DIR_HOSTPKG}/bin/swig -python -c++ -I../../../../src/include -oh mod_python_wrap.h -o mod_python_wrap.cpp mod_python.i
-       echo "#include \"mod_python_extra.c\"" >> mod_python_wrap.cpp
-       patch -s -p0 -i hack.diff
diff --git a/net/freeswitch/patches/musl/src-mod-languages-mod_python-freeswitch_python_cpp.patch b/net/freeswitch/patches/musl/src-mod-languages-mod_python-freeswitch_python_cpp.patch
deleted file mode 100644 (file)
index 9d509c8..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/src/mod/languages/mod_python/freeswitch_python.cpp
-+++ b/src/mod/languages/mod_python/freeswitch_python.cpp
-@@ -319,7 +319,12 @@ switch_status_t Session::run_dtmf_callba
-       }
-       if ((pyresult = PyEval_CallObject(cb_function, arglist))) {
-+#if PY_MAJOR_VERSION < 3
-               str = (char *) PyString_AsString(pyresult);
-+#else
-+              //str = (char *) pyresult->encode('UTF-8');
-+              str = (char *) PyUnicode_AsUnicode(pyresult);
-+#endif
-       } else {
-               PyErr_Print();
-       }
diff --git a/net/freeswitch/patches/uClibc/Makefile_am.patch b/net/freeswitch/patches/uClibc/Makefile_am.patch
deleted file mode 100644 (file)
index d08c6a1..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -559,7 +559,7 @@ libs/libzrtp/libzrtp.a:
-       cd libs/libzrtp && $(MAKE)
- libs/libvpx/Makefile:
--      cd libs/libvpx && CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --enable-pic --disable-docs --disable-examples --disable-install-bins --disable-install-srcs --disable-unit-tests --extra-cflags="$(VISIBILITY_FLAG)"
-+      cd libs/libvpx && CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CROSS="$(ARCH)-openwrt-linux LD=$(CXX)" ./configure --target=generic-gnu --enable-pic --disable-docs --disable-examples --disable-install-bins --disable-install-srcs --disable-unit-tests --extra-cflags="$(VISIBILITY_FLAG)"
- libs/libvpx/libvpx.a: libs/libvpx/Makefile
-       @cd libs/libvpx && $(MAKE)
diff --git a/net/freeswitch/patches/uClibc/build-config-erlang_m4.patch b/net/freeswitch/patches/uClibc/build-config-erlang_m4.patch
deleted file mode 100644 (file)
index 5d744f7..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
---- a/build/config/erlang.m4
-+++ b/build/config/erlang.m4
-@@ -1,6 +1,6 @@
- AC_DEFUN([CHECK_ERLANG], [
- #
--# Erlang checks for mod_erlang_event
-+# Erlang check
- #
- AC_ARG_WITH(
-       [erlang],
-@@ -20,22 +20,23 @@ then
-               if test ! -x "$with_erlang" ; then
-                       AC_MSG_ERROR([Specified erlang does not exist or is not executable: $with_erlang])
-               fi
--              AC_MSG_RESULT([$with_erlang])
--              AC_SUBST([ERLANG], ["$with_erlang"])
-+              AC_MSG_RESULT(["$with_erlang/bin/erl"])
-+              AC_SUBST([ERL],["$with_erlang/bin/erl"])
-       else
--              AC_PATH_PROG([ERLANG], ["erl"], ["no"], ["$PATH:/usr/bin:/usr/local/bin"])
-+              AC_ERLANG_NEED_ERL(["$with_erlang/bin"])
-       fi
--      if test "$ERLANG" != "no" ; then
-+      if test "$ERL" != "no" ; then
-               AC_MSG_CHECKING([erlang version])
--              ERLANG_VER="`$ERLANG -version 2>&1 | cut -d' ' -f6`"
-+              ERLANG_VER="`$ERL -version 2>&1 | cut -d' ' -f6`"
-               if test -z "$ERLANG_VER" ; then
-                       AC_MSG_ERROR([Unable to detect erlang version])
-+              else
-+                      AC_MSG_RESULT([$ERLANG_VER])
-               fi
--              AC_MSG_RESULT([$ERLANG_VER])
--              ERLANG_LIBDIR=`$ERLANG -noshell -eval 'io:format("~n~s/lib~n", [[code:lib_dir("erl_interface")]]).' -s erlang halt | tail -n 1`
-+              ERLANG_LIBDIR=`$ERL -noshell -eval 'io:format("~n~s/lib~n", [[code:lib_dir("erl_interface")]]).' -s erlang halt | tail -n 1`
-               AC_MSG_CHECKING([erlang libdir])
-               if test -z "`echo $ERLANG_LIBDIR`" ; then
-                       AC_MSG_ERROR([failed])
-@@ -43,9 +44,16 @@ then
-                       ERLANG_LDFLAGS="-L$ERLANG_LIBDIR $ERLANG_LDFLAGS"
-                       LIBS="-L$ERLANG_LIBDIR $LIBS"
-               fi
-+
-+              #
-+              # Don't use the above ERLANG_LDFLAGS
-+              #
-+              ERLANG_LIBDIR="${STAGING_DIR}/usr/lib"
-+              ERLANG_LDFLAGS="-L$ERLANG_LIBDIR"
-+              LIBS="-L$ERLANG_LIBDIR $LIBS"
-               AC_MSG_RESULT([$ERLANG_LIBDIR])
--              ERLANG_INCDIR=`$ERLANG -noshell -eval 'io:format("~n~s/include~n", [[code:lib_dir("erl_interface")]]).' -s erlang halt | tail -n 1`
-+              ERLANG_INCDIR=`$ERL -noshell -eval 'io:format("~n~s/include~n", [[code:lib_dir("erl_interface")]]).' -s erlang halt | tail -n 1`
-               AC_MSG_CHECKING([erlang incdir])
-               if test -z "`echo $ERLANG_INCDIR`" ; then
-                       AC_MSG_ERROR([failed])
-@@ -59,10 +67,11 @@ then
-               ERLANG_LIB="ei"
--              # check liei
-+              # check libei
-               AC_CHECK_LIB([$ERLANG_LIB], [ei_encode_version], [has_libei="yes"], [has_libei="no"])
-               # maybe someday ei will actually expose this?
--              AC_CHECK_LIB([$ERLANG_LIB], [ei_link_unlink], [ERLANG_CFLAGS="$ERLANG_CFLAGS -DEI_LINK_UNLINK"])
-+              # until then, we comment it out
-+              #AC_CHECK_LIB([$ERLANG_LIB], [ei_link_unlink], [ERLANG_CFLAGS="$ERLANG_CFLAGS -DEI_LINK_UNLINK"])
-               if test "$has_libei" = "no" ; then
-                       AS_IF([test "$with_erlang" = "try"],
-@@ -76,7 +85,7 @@ then
-                       )
-               else
-                       ERLANG_LDFLAGS="$ERLANG_LDFLAGS -lei"
--                      AC_MSG_NOTICE([Your erlang seems OK, do not forget to enable mod_erlang_event in modules.conf])
-+                      AC_MSG_NOTICE([Your erlang seems OK. You can now use ErLang in your codes.])
-                       AC_SUBST([ERLANG_CFLAGS],  [$ERLANG_CFLAGS])
-                       AC_SUBST([ERLANG_LDFLAGS], [$ERLANG_LDFLAGS])
-                       AM_CONDITIONAL([HAVE_ERLANG],[true])
-@@ -87,12 +96,12 @@ then
-       else
-               AS_IF([test "$with_erlang" = "try"],
--                      [AC_MSG_WARN([Could not find erlang, mod_erlang_event will not build, use --with-erlang to specify the location])],
-+                      [AC_MSG_WARN([Could not find erlang, codes depend on erlang will not build, use --with-erlang to specify the location])],
-                       [AC_MSG_ERROR([Could not find erlang, use --with-erlang to specify the location])]
-               )
-       fi
- else
--      AC_MSG_WARN([erlang support disabled, building mod_erlang_event will fail!])
-+      AC_MSG_WARN([erlang support disabled!])
- fi
- ])
diff --git a/net/freeswitch/patches/uClibc/build-modules_conf_in.patch b/net/freeswitch/patches/uClibc/build-modules_conf_in.patch
deleted file mode 100644 (file)
index 8fee317..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/build/modules.conf.in
-+++ b/build/modules.conf.in
-@@ -39,6 +39,7 @@ applications/mod_httapi
- #applications/mod_rad_auth
- #applications/mod_redis
- #applications/mod_rss
-+#applications/mod_skel
- applications/mod_sms
- #applications/mod_sms_flowroute
- #applications/mod_snapshot
diff --git a/net/freeswitch/patches/uClibc/build-openwrt_rules.mk.patch b/net/freeswitch/patches/uClibc/build-openwrt_rules.mk.patch
deleted file mode 100644 (file)
index 31fb16f..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
---- /dev/null
-+++ b/build/openwrt_rules.mk
-@@ -0,0 +1,7 @@
-+OPENWRT_DIR=$(shell (cd $(BASE)/../../..;pwd))
-+STAGING_PREFIX=$(OPENWRT_DIR)/staging_dir/host
-+STAGING_DIR=$(OPENWRT_DIR)/staging_dir/$(shell (cd $(BASE)/..;basename `pwd`))
-+ARCH="$(shell grep CONFIG_ARCH $(OPENWRT_DIR)/.config|cut -d= -d'"' -f2)"
-+GNU_TARGET_NAME=$(ARCH)-openwrt-linux
-+
-+include $(OPENWRT_DIR)/rules.mk
diff --git a/net/freeswitch/patches/uClibc/configure_ac.patch b/net/freeswitch/patches/uClibc/configure_ac.patch
deleted file mode 100644 (file)
index 1a1c88c..0000000
+++ /dev/null
@@ -1,178 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -257,9 +257,9 @@ AX_COMPILER_VENDOR
- if test "x${cross_compiling}" = "xyes"; then
-     CC_FOR_BUILD=${CC_FOR_BUILD-gcc}
-     case "$host" in
--       arm*-linux-gnueabi*|arm*-*-linux-gnueabi*)
-+       arm*-linux-gnueabi*|arm*-*-linux-*)
-               # spandsp modem
--              ac_cv_file__dev_ptmx=yes
-+              ac_cv_file__dev_ptmx=no
-               # libjs
-               export ac_cv_va_copy=yes
-               # srtp
-@@ -276,7 +276,7 @@ if test "x${cross_compiling}" = "xyes";
-               export apr_cv_mutex_recursive=yes
-               export ac_cv_func_pthread_rwlock_init=yes
-               export apr_cv_type_rwlock_t=yes
--              export apr_cv_process_shared_works=yes
-+              #export apr_cv_process_shared_works=no
-               export apr_cv_mutex_robust_shared=yes
-        ;;
-     esac
-@@ -419,10 +419,6 @@ elif test "x${ax_cv_c_compiler_vendor}"
-     APR_ADDTO(SWITCH_AM_CFLAGS, -fPIC -ffast-math)
-     APR_ADDTO(SWITCH_AM_CXXFLAGS, -fPIC -ffast-math)
-     AC_SUBST([AM_MOD_AVMD_CXXFLAGS], [-std=gnu99])      # FS-8809, needed for MAP_POPULATE
--    if test "$ac_cv_gcc_supports_w_no_unused_result" = yes; then
--      APR_ADDTO(SWITCH_AM_CFLAGS, -Werror)
--      APR_ADDTO(SWITCH_AM_CFLAGS, -Wno-unused-result)
--    fi
-     if test "$ac_cv_gcc_supports_w_no_misleading_indentation" = yes; then
-       APR_ADDTO(SWITCH_AM_CFLAGS, -Wno-misleading-indentation)
-     fi
-@@ -948,7 +944,6 @@ AC_CHECK_LIB(pthread, pthread_setschedpa
- AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket))
--AC_CHECK_FILE(/dev/ptmx, [AC_DEFINE(HAVE_DEV_PTMX, 1, [Define if you have /dev/ptmx])])
- AC_CHECK_LIB(util, openpty, [AC_DEFINE(HAVE_OPENPTY, 1, [Define if you have openpty()])])
- AC_CHECK_MEMBERS([struct tm.tm_gmtoff],,,[
-@@ -1560,18 +1555,18 @@ AM_CONDITIONAL([HAVE_MYSQL],[test "$foun
- # perl checks
- #
--AC_CHECK_PROG(PERL,perl,[ac_cv_have_perl=yes],[ac_cv_have_perl=no])
--
--# -a "x$ac_cv_have_EXTERN_h" != "xno"
-+AC_CHECK_PROG(PERL,[perl],[yes],[no],[${STAGING_DIR_HOSTPKG}/usr/bin])
-+PERL=$as_dir/$ac_word$ac_exec_ext
--if test "x$ac_cv_have_perl" != "xno"; then
--   PERL=perl
--   PERL_SITEDIR="`$PERL -MConfig -e 'print $Config{archlib}'`"
--   PERL_LIBDIR="-L`$PERL -MConfig -e 'print $Config{archlib}'`/CORE"
--   PERL_LIBS="`$PERL -MConfig -e 'print $Config{libs}'`"
--   PERL_CFLAGS="-w -DMULTIPLICITY `$PERL -MExtUtils::Embed -e ccopts | sed -e 's|-arch x86_64 -arch i386||'` -DEMBED_PERL"
--   PERL_LDFLAGS="`$PERL -MExtUtils::Embed -e ldopts| sed -e 's|-arch x86_64 -arch i386||'`"
--   PERL_INC="`$PERL -MExtUtils::Embed -e perl_inc`"
-+if test "x$ac_cv_prog_PERL" != "xno"; then
-+   PERL_VERSION="`$PERL -e 'print substr($^V, 1)' | cut -d. -f1,2`"
-+   PERL_SITEDIR_LOCAL="`$PERL -MConfig -e 'print $Config{archlibexp}'`"
-+   PERL_SITEDIR="`find ${STAGING_DIR}/usr -name $PERL_VERSION -print`"
-+   PERL_LIBDIR="-L$PERL_SITEDIR/CORE"
-+   PERL_LIBS="`$PERL -MConfig -e 'print $Config{libs}' | sed -e 's|-lnsl ||g;s| -lgdbm_compat||g'`"
-+   PERL_CFLAGS="-w -DMULTIPLICITY -D_REENTRANT -D_GNU_SOURCE -DPERL_USE_SAFE_PUTENV `$PERL -MExtUtils::Embed -e ccopts | sed -e \"s|$PERL_SITEDIR_LOCAL|$PERL_SITEDIR|g;s| -I/usr/local/include||g\"` -DEMBED_PERL"
-+   PERL_LDFLAGS="`$PERL -MExtUtils::Embed -e ldopts| sed -e \"s| $PERL_SITEDIR_LOCAL/auto/NDBM_File/NDBM_File.a||g;s| $PERL_SITEDIR_LOCAL/auto/ODBM_File/ODBM_File.a||g;s|$PERL_SITEDIR_LOCAL|$PERL_SITEDIR|g;s|.a |.so |g;s|-lnsl ||g;s|-lgdbm_compat ||g;s|/usr/local|${STAGING_DIR}/usr|g\"`"
-+   PERL_INC="-I$PERL_SITEDIR/CORE"
-    save_CFLAGS="$CFLAGS"
-    CFLAGS="$PERL_CFLAGS"
-@@ -1581,34 +1576,39 @@ if test "x$ac_cv_have_perl" != "xno"; th
-    save_LDFLAGS="$LDFLAGS"
-    LDFLAGS="$PERL_LDFLAGS"
--   AC_CHECK_LIB([perl], [perl_alloc], ac_cv_use_libperl=yes, ac_cv_use_libperl=no)
-+   AC_CHECK_LIB([perl], [perl_alloc], [ac_cv_use_libperl=yes], [ac_cv_use_libperl=no])
-    LDFLAGS="$save_LDFLAGS"
-+   AC_SUBST(PERL)
-    AC_SUBST(PERL_SITEDIR)
-+   AC_SUBST(PERL_SITEDIR_LOCAL)
-    AC_SUBST(PERL_LIBDIR)
-    AC_SUBST(PERL_LIBS)
-    AC_SUBST(PERL_CFLAGS)
-    AC_SUBST(PERL_LDFLAGS)
-    AC_SUBST(PERL_INC)
-+   AC_SUBST(PERL_VERSION)
- fi
--AM_CONDITIONAL([HAVE_PERL],[test "x$ac_cv_have_perl" != "xno" -a "x$ac_cv_have_EXTERN_h" != "xno" -a "x$ac_cv_use_libperl" != "xno"])
-+AM_CONDITIONAL([HAVE_PERL],[test "x$ac_cv_prog_PERL" = "xyes" -a "x$ac_cv_have_EXTERN_h" = "xyes" -a "x$ac_cv_use_libperl" = "xyes"])
-+#AM_CONDITIONAL([HAVE_PERL],[test "x$ac_cv_prog_PERL" != "xno" -a "x$ac_cv_have_EXTERN_h" != "xno"])
- #
- # php checks
- #
- AC_CHECK_PROG(PHP,php,[ac_cv_have_php=yes],[ac_cv_have_php=no])
--AC_CHECK_PROG(PHP_CONFIG,php-config,[ac_cv_have_php_config=yes],[ac_cv_have_php_config=no])
-+dnl AC_CHECK_PROG(PHP_CONFIG,php-config,[ac_cv_have_php_config=yes],[ac_cv_have_php_config=no],[${STAGING_DIR}/usr/bin])
-+AC_CHECK_PROG(PHP_CONFIG,php7-config,[ac_cv_have_php_config=yes],[ac_cv_have_php_config=no],[${STAGING_DIR}/usr/bin])
- AM_CONDITIONAL([HAVE_PHP],[test "x$ac_cv_have_php" != "xno" -a "x$ac_cv_have_php_config" != "xno"])
- if test "x$ac_cv_have_php" != "xno" -a "x$ac_cv_have_php_config" != "xno"; then
-    PHP=php
--   PHP_CONFIG=php-config
-+   PHP_CONFIG=${STAGING_DIR}/usr/bin/php7-config
-    PHP_LDFLAGS="`$PHP_CONFIG --ldflags`"
-    PHP_LIBS="`$PHP_CONFIG --libs | sed -r 's/ ?-l(bz2|pcre|xml2|gssapi_krb5|krb5|k5crypto|com_err|history|z|readline|gmp|ssl|crypto)//g'`"
-    PHP_EXT_DIR="`$PHP_CONFIG --extension-dir`"
--   PHP_INC_DIR="`$PHP -r 'echo ini_get("include_path");' | cut -d: -f2`"
-+   PHP_INC_DIR="`$PHP_CONFIG --includes | cut -d" " -f1 | cut -dI -f2`"
-    PHP_INI_DIR="`$PHP_CONFIG --configure-options | tr " " "\n" | grep -- --with-config-file-scan-dir | cut -f2 -d=`"
-    PHP_CFLAGS="`$PHP_CONFIG --includes`"
-    AC_SUBST(PHP_LDFLAGS)
-@@ -1623,7 +1623,7 @@ fi
- # Python checks for mod_python
- #
- AC_ARG_WITH(
--      [python],
-+      [python3],
-       [AS_HELP_STRING([--with-python], [Use system provided version of python (default: try)])],
-       [with_python="$withval"],
-       [with_python="try"]
-@@ -1642,17 +1642,18 @@ then
-               AC_MSG_RESULT([$with_python])
-               AC_SUBST([PYTHON], ["$with_python"])
-       else
--              AC_PATH_PROG([PYTHON], ["python"], ["no"], ["$PATH:/usr/bin:/usr/local/bin"])
-+              AC_PATH_PROG([PYTHON], ["python3"], ["no"], ["${STAGING_DIR_HOSTPKG}/bin"])
-       fi
-       if test "$PYTHON" != "no" ; then
-               AC_MSG_CHECKING([python version])
--              PYTHON_VER="`$PYTHON -V 2>&1 | cut -d' ' -f2`"
-+              PYTHON_VER=`$PYTHON -c "import sys; print('%d.%d' % (sys.version_info[[0]], sys.version_info[[1]]))"`
-               if test -z "$PYTHON_VER" ; then
-                       AC_MSG_ERROR([Unable to detect python version])
-               fi
-               AC_MSG_RESULT([$PYTHON_VER])
-+              AC_SUBST([PYTHON_VER], [$PYTHON_VER])
-               AC_MSG_CHECKING([for python distutils])
-               python_result="`$PYTHON -c 'import distutils;' 2>&1`"
-@@ -1666,12 +1667,12 @@ then
-               if test "$python_has_distutils" != "no" ; then
-                       AC_MSG_CHECKING([location of site-packages])
--                      PYTHON_SITE_DIR="`$PYTHON -c 'from distutils import sysconfig; print(sysconfig.get_python_lib(0));'`"
-+                      if test -d "`$PYTHON -c 'from distutils import sysconfig; print(sysconfig.get_python_lib(0));'`" ; then
-+                              PYTHON_SITE_DIR="`$PYTHON -c 'from distutils import sysconfig; print(sysconfig.get_python_lib(0));'`"
--                      if test -z "$PYTHON_SITE_DIR" ; then
--                              AC_MSG_ERROR([Unable to detect python site-packages path])
--                      elif test ! -d "$PYTHON_SITE_DIR" ; then
--                              AC_MSG_ERROR([Path $PYTHON_SITE_DIR returned by python does not exist!])
-+                              if test -z "$PYTHON_SITE_DIR" ; then
-+                                      AC_MSG_ERROR([Unable to detect python site-packages path])
-+                              fi
-                       fi
-                       AC_MSG_RESULT([$PYTHON_SITE_DIR])
-                       AC_SUBST([PYTHON_SITE_DIR], [$PYTHON_SITE_DIR])
-@@ -1679,10 +1680,10 @@ then
-                       #
-                       # python distutils found, get settings from python directly
-                       #
--                      PYTHON_CFLAGS="`$PYTHON -c 'from distutils import sysconfig; flags = [[\"-I\" + sysconfig.get_python_inc(0), \"-I\" + sysconfig.get_python_inc(1), \" \".join(sysconfig.get_config_var(\"CFLAGS\").split())]]; print(\" \".join(flags));' | sed -e 's/-arch i386//g;s/-arch x86_64//g'`"
-+                      PYTHON_CFLAGS="`$PYTHON -c 'from distutils import sysconfig; flags = [[\"-I\" + sysconfig.get_python_inc(0), \"-I\" + sysconfig.get_python_inc(1), \" \".join(sysconfig.get_config_var(\"CFLAGS\").split())]]; print(\" \".join(flags));'`"
-                       PYTHON_LDFLAGS="`$PYTHON -c 'from distutils import sysconfig; libs = sysconfig.get_config_var(\"LIBS\").split() + sysconfig.get_config_var(\"SYSLIBS\").split(); libs.append(\"-lpython\"+sysconfig.get_config_var(\"VERSION\")); print(\" \".join(libs));'`"
-                       PYTHON_LIB="`$PYTHON -c 'from distutils import sysconfig; print(\"python\" + sysconfig.get_config_var(\"VERSION\"));'`"
--                      PYTHON_LIBDIR="`$PYTHON -c 'from distutils import sysconfig; print(sysconfig.get_config_var(\"LIBDIR\"));'`"
-+                      PYTHON_LIBDIR="`$PYTHON -c 'from distutils import sysconfig; print(sysconfig.get_config_var(\"LIBDIR\"));' | sed -e 's|\(^.*\)/staging_dir/hostpkg|/${STAGING_DIR}/usr|g'`"
-                       # handle python being installed into /usr/local
-                       AC_MSG_CHECKING([python libdir])
diff --git a/net/freeswitch/patches/uClibc/libs-apr-configure_ac.patch b/net/freeswitch/patches/uClibc/libs-apr-configure_ac.patch
deleted file mode 100644 (file)
index 7c0630f..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
---- a/libs/apr/configure.ac
-+++ b/libs/apr/configure.ac
-@@ -1624,38 +1624,7 @@ if test "$threads" = "1"; then
-     APR_CHECK_DEFINE(PTHREAD_PROCESS_SHARED, pthread.h)
-     AC_CHECK_FUNCS(pthread_mutexattr_setpshared)
-     AC_CHECK_LIB(pthread, pthread_setschedparam, [AC_DEFINE(HAVE_PTHREAD_SETSCHEDPARAM, 1, [Define if you have pthread_setschedparam()])])
--
--    # Some systems have setpshared and define PROCESS_SHARED, but don't 
--    # really support PROCESS_SHARED locks.  So, we must validate that we 
--    # can go through the steps without receiving some sort of system error.
--    # Linux and older versions of AIX have this problem.
--    APR_IFALLYES(header:pthread.h define:PTHREAD_PROCESS_SHARED func:pthread_mutexattr_setpshared, [
--      AC_CACHE_CHECK([for working PROCESS_SHARED locks], apr_cv_process_shared_works, [
--      AC_TRY_RUN([
--#include <sys/types.h>
--#include <pthread.h>
--        int main()
--        {
--            pthread_mutex_t mutex;
--            pthread_mutexattr_t attr;
--            if (pthread_mutexattr_init(&attr))
--                exit(1);
--            if (pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_SHARED))
--                exit(2);
--            if (pthread_mutex_init(&mutex, &attr))
--                exit(3);
--            if (pthread_mutexattr_destroy(&attr))
--                exit(4);
--            if (pthread_mutex_destroy(&mutex))
--                exit(5);
--            exit(0);
--        }], [apr_cv_process_shared_works=yes], [apr_cv_process_shared_works=no])])
--      # Override detection of pthread_mutexattr_setpshared
--      ac_cv_func_pthread_mutexattr_setpshared=$apr_cv_process_shared_works])
--
--    if test "$ac_cv_func_pthread_mutexattr_setpshared" = "yes"; then
--        APR_CHECK_PTHREAD_ROBUST_SHARED_MUTEX
--    fi
-+    APR_CHECK_PTHREAD_ROBUST_SHARED_MUTEX
- fi
- # See which lock mechanisms we can support on this system.
-@@ -1956,7 +1925,11 @@ fi
- APR_CHECK_TCP_NODELAY_INHERITED
- APR_CHECK_O_NONBLOCK_INHERITED
--APR_CHECK_TCP_NODELAY_WITH_CORK
-+
-+dnl Check TCP_NODELAY_WITH_CORK ONLY when NOT cross compiling
-+if test "$cross_compiling" != yes; then
-+      APR_CHECK_TCP_NODELAY_WITH_CORK
-+fi
- # Look for a way of corking TCP...
- APR_CHECK_DEFINE(TCP_CORK, netinet/tcp.h)
diff --git a/net/freeswitch/patches/uClibc/libs-apr-util-configure_gnu.patch b/net/freeswitch/patches/uClibc/libs-apr-util-configure_gnu.patch
deleted file mode 100644 (file)
index b933b3c..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/libs/apr-util/configure.gnu
-+++ b/libs/apr-util/configure.gnu
-@@ -1,4 +1,4 @@
- #! /bin/sh
- srcpath=$(dirname $0 2>/dev/null )  || srcpath="." 
--$srcpath/configure "$@" --with-apr=../apr --disable-shared --with-pic --without-sqlite2 --without-sqlite3 --with-expat=builtin
-+$srcpath/configure "$@" --with-apr=../apr --disable-shared --with-expat=builtin
diff --git a/net/freeswitch/patches/uClibc/libs-srtp-configure_ac.patch b/net/freeswitch/patches/uClibc/libs-srtp-configure_ac.patch
deleted file mode 100644 (file)
index 56c1691..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/libs/srtp/configure.ac
-+++ b/libs/srtp/configure.ac
-@@ -130,10 +130,6 @@ if test "$enable_kernel_linux" = "yes";
- fi
- AC_MSG_RESULT($enable_kernel_linux)
--dnl Check for /dev/urandom
--AC_CHECK_FILE(/dev/urandom, DEV_URANDOM=/dev/urandom,
--   [AC_CHECK_FILE(/dev/random, DEV_URANDOM=/dev/random)])
--
- dnl Checks for header files.
- AC_HEADER_STDC
- AC_CHECK_HEADERS(stdlib.h)
diff --git a/net/freeswitch/patches/uClibc/src-mod-applications-mod_http_cache-conf-autoload_configs-http_cache_conf_xml.patch b/net/freeswitch/patches/uClibc/src-mod-applications-mod_http_cache-conf-autoload_configs-http_cache_conf_xml.patch
deleted file mode 100644 (file)
index 27f1b5f..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/src/mod/applications/mod_http_cache/conf/autoload_configs/http_cache.conf.xml
-+++ b/src/mod/applications/mod_http_cache/conf/autoload_configs/http_cache.conf.xml
-@@ -9,9 +9,9 @@
-     <param name="ssl-verifyhost" value="true"/>
-     <param name="ssl-verifypeer" value="true"/>
-     <!-- default is 300 seconds, override here -->
--    <!--param name="connect-timeout" value="300"/-->
-+    <!-- param name="connect-timeout" value="300"/> -->
-     <!-- default is 300 seconds, override here -->
--    <!--param name="download-timeout" value="300"/-->
-+    <!--param name="download-timeout" value="300"/> -->
-   </settings>
-   <profiles>
diff --git a/net/freeswitch/patches/uClibc/src-mod-endpoints-mod_sofia-conf-sofia_conf_xml.patch b/net/freeswitch/patches/uClibc/src-mod-endpoints-mod_sofia-conf-sofia_conf_xml.patch
deleted file mode 100644 (file)
index 78db028..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/mod/endpoints/mod_sofia/conf/sofia.conf.xml
-+++ b/src/mod/endpoints/mod_sofia/conf/sofia.conf.xml
-@@ -216,7 +216,7 @@
-         <!-- <param name="unregister-on-options-fail" value="true"/> -->
-         <!-- Send an OPTIONS packet to all registered endpoints -->
-         <!--<param name="all-reg-options-ping" value="true"/>-->
--        <!-- Send an OPTIONS packet to NATed registered endpoints. Can be 'true' or 'udp-only
-+        <!-- Send an OPTIONS packet to NATed registered endpoints. Can be 'true' or 'udp-only -->
-         <!--<param name="nat-options-ping" value="true"/>-->
-         <!-- TLS: disabled by default, set to "true" to enable -->
diff --git a/net/freeswitch/patches/uClibc/src-mod-endpoints-mod_verto-Makefile_am.patch b/net/freeswitch/patches/uClibc/src-mod-endpoints-mod_verto-Makefile_am.patch
deleted file mode 100644 (file)
index acf7216..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/src/mod/endpoints/mod_verto/Makefile.am
-+++ b/src/mod/endpoints/mod_verto/Makefile.am
-@@ -9,19 +9,19 @@ mod_verto_la_LIBADD   = $(switch_builddi
- mod_verto_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
- if HAVE_PERL
--#perldir = $(PERL_SITEDIR)
--noinst_LTLIBRARIES = MCAST.la
-+perldir = /usr/lib/perl5/@PERL_VERSION@/CORE
-+perl_LTLIBRARIES = MCAST.la
- MCAST_la_SOURCES   = mcast/mcast_wrap.cpp mcast/perlxsi.c mcast/mcast.c mcast/mcast_cpp.cpp
- MCAST_la_CFLAGS    = $(CC_CFLAGS) $(CFLAGS) $(SWITCH_AM_CFLAGS) $(PERL_CFLAGS)
- MCAST_la_CXXFLAGS  = $(SWITCH_AM_CXXFLAGS) $(CXXFLAGS) -w $(PERL_INC)
- MCAST_la_CPPFLAGS  = -I$(switch_srcdir)/src/mod/endpoints/mod_verto/mcast
- MCAST_la_LDFLAGS   = -avoid-version -module -no-undefined -shared $(PERL_LDFLAGS)
--#install-data-local: perlmod-install
-+install-data-local: perlmod-install
--#perlmod-install: install-perlLTLIBRARIES
--#     install -d -m 755 $(DESTDIR)$(PERL_SITEDIR)
--#     install -m 755 mcast/MCAST.pm $(DESTDIR)$(PERL_SITEDIR)
-+perlmod-install: install-perlLTLIBRARIES
-+      install -d -m 755 $(DESTDIR)$(perldir)
-+      install -m 755 mcast/MCAST.pm $(DESTDIR)$(perldir)
- endif
- mcast/esl_wrap.cpp:
diff --git a/net/freeswitch/patches/uClibc/src-mod-languages-mod_perl-Makefile_am.patch b/net/freeswitch/patches/uClibc/src-mod-languages-mod_perl-Makefile_am.patch
deleted file mode 100644 (file)
index fd3f1e5..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
---- a/src/mod/languages/mod_perl/Makefile.am
-+++ b/src/mod/languages/mod_perl/Makefile.am
-@@ -1,29 +1,27 @@
- include $(top_srcdir)/build/modmake.rulesam
- MODNAME=mod_perl
--PERL        = perl
--PERL_LIBDIR =-L`perl -MConfig -e 'print $$Config{archlib}'`/CORE
--PERL_LIBS   =`perl -MConfig -e 'print $$Config{libs}'`
--perldir=$(prefix)/perl
-+perldir = /usr/lib/perl5/@PERL_VERSION@/CORE
- mod_LTLIBRARIES = mod_perl.la
- perl_LTLIBRARIES = freeswitch.la
- mod_perl_la_SOURCES  = mod_perl.c freeswitch_perl.cpp mod_perl_wrap.cpp perlxsi.c
--mod_perl_la_CFLAGS   = $(SWITCH_AM_CFLAGS)
--mod_perl_la_CXXFLAGS = $(SWITCH_AM_CXXFLAGS)
--mod_perl_la_CPPFLAGS = -w -DMULTIPLICITY `$(PERL) -MExtUtils::Embed -e ccopts` -DEMBED_PERL -I$(switch_srcdir)/libs/libteletone/src/ 
-+mod_perl_la_CFLAGS   = $(SWITCH_AM_CFLAGS) @PERL_INC@
-+mod_perl_la_CXXFLAGS = $(SWITCH_AM_CXXFLAGS) @PERL_INC@
-+mod_perl_la_CPPFLAGS = @PERL_CFLAGS@ -I$(switch_srcdir)/libs/libteletone/src/
- mod_perl_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
--mod_perl_la_LDFLAGS  = -avoid-version -module -no-undefined -shared `$(PERL) -MExtUtils::Embed -e ldopts` `$(PERL) -MConfig -e 'print $$Config{libs}'`
-+mod_perl_la_LDFLAGS  = -avoid-version -module -no-undefined -shared @PERL_LDFLAGS@ @PERL_LIBS@
- freeswitch_la_SOURCES = freeswitch_perl.cpp mod_perl_wrap.cpp perlxsi.c
- freeswitch_la_LDFLAGS = -avoid-version -module -no-undefined -shared $(LDFLAGS)
--freeswitch_la_CPPFLAGS = $(SWITCH_AM_CPPFLAGS) -w -DMULTIPLICITY `$(PERL) -MExtUtils::Embed -e ccopts` -DEMBED_PERL -I$(switch_srcdir)/libs/libteletone/src/ 
-+freeswitch_la_CPPFLAGS = $(SWITCH_AM_CPPFLAGS) @PERL_CFLAGS@ -I$(switch_srcdir)/libs/libteletone/src/
-+
- reswig:       swigclean mod_perl_wrap.cpp
- swigclean: clean
-       rm -f mod_perl_wrap.* freeswitch.so freeswitch.pm
- mod_perl_wrap.cpp:
--      swig2.0 -static -shadow -perl5 -c++ -DMULTIPLICITY -I../../../../src/include -o mod_perl_wrap.cpp freeswitch.i
-+      ${STAGING_DIR_HOSTPKG}/bin/swig -static -shadow -perl5 -c++ -DMULTIPLICITY -I../../../../src/include -o mod_perl_wrap.cpp freeswitch.i
-       echo "#include \"mod_perl_extra.c\"" >> mod_perl_wrap.cpp
-       patch -s -p0 -i hack.diff
-@@ -31,7 +29,7 @@ orig: mod_perl_wrap.cpp
-       patch -R -s -p0 -i hack.diff
- .perlok:
--      @(${PERL} -V | grep -i usemultiplicity=define >/dev/null && echo Phew, You have the right perl.) \
-+      @(@PERL@ -V | grep -i usemultiplicity=define >/dev/null && echo Phew, You have the right perl.) \
-       || ((echo Sorry, you need to compile perl with threads and multiplicity.&& exit 1))
-       @touch .perlok
diff --git a/net/freeswitch/patches/uClibc/src-mod-languages-mod_python-Makefile_am.patch b/net/freeswitch/patches/uClibc/src-mod-languages-mod_python-Makefile_am.patch
deleted file mode 100644 (file)
index 185006e..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/mod/languages/mod_python/Makefile.am
-+++ b/src/mod/languages/mod_python/Makefile.am
-@@ -2,7 +2,7 @@ include $(top_srcdir)/build/modmake.rule
- MODNAME=mod_python
- PYMOD=freeswitch
--PYTHON_SITE_DIR=@PYTHON_SITE_DIR@
-+PYTHON_SITE_DIR=/usr/lib/python@PYTHON_VER@/site-packages
- SWIGCFILE=../../../switch_swig.c
- SWIGIFILE=../../../switch_swig.i
-@@ -20,7 +20,7 @@ swigclean: clean
-       rm -f mod_python_wrap.* freeswitch.py
- mod_python_wrap.cpp: mod_python_extra.c hack.diff 
--      swig2.0 -python -c++ -I../../../../src/include -oh mod_python_wrap.h -o mod_python_wrap.cpp mod_python.i
-+      ${STAGING_DIR_HOSTPKG}/bin/swig -python -c++ -I../../../../src/include -oh mod_python_wrap.h -o mod_python_wrap.cpp mod_python.i
-       echo "#include \"mod_python_extra.c\"" >> mod_python_wrap.cpp
-       patch -s -p0 -i hack.diff
diff --git a/net/freeswitch/patches/uClibc/src-mod-languages-mod_python-freeswitch_python_cpp.patch b/net/freeswitch/patches/uClibc/src-mod-languages-mod_python-freeswitch_python_cpp.patch
deleted file mode 100644 (file)
index 9d509c8..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/src/mod/languages/mod_python/freeswitch_python.cpp
-+++ b/src/mod/languages/mod_python/freeswitch_python.cpp
-@@ -319,7 +319,12 @@ switch_status_t Session::run_dtmf_callba
-       }
-       if ((pyresult = PyEval_CallObject(cb_function, arglist))) {
-+#if PY_MAJOR_VERSION < 3
-               str = (char *) PyString_AsString(pyresult);
-+#else
-+              //str = (char *) pyresult->encode('UTF-8');
-+              str = (char *) PyUnicode_AsUnicode(pyresult);
-+#endif
-       } else {
-               PyErr_Print();
-       }