From 7b56edaa63c887a2b73405d9e6abda40cde3043b Mon Sep 17 00:00:00 2001 From: "Vittorio G (VittGam)" Date: Thu, 14 May 2015 04:15:44 +0200 Subject: Avoid trying to load the echo module here It would result in the warning "echo is already loaded" during package installation. Signed-off-by: Vittorio Gambaletta --- libs/dahdi-linux/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/dahdi-linux/Makefile b/libs/dahdi-linux/Makefile index 92b5f82..7425eb9 100644 --- a/libs/dahdi-linux/Makefile +++ b/libs/dahdi-linux/Makefile @@ -43,7 +43,7 @@ define KernelPackage/dahdi-echocan-oslec DEPENDS:=kmod-dahdi +kmod-echo URL:=http://www.asterisk.org/ FILES:=$(PKG_BUILD_DIR)/drivers/dahdi/dahdi_echocan_oslec.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoProbe,echo dahdi_echocan_oslec) + AUTOLOAD:=$(call AutoProbe,dahdi_echocan_oslec) endef define KernelPackage/dahdi-echocan-oslec/description -- cgit From 2d319d006337dd860637583d51bd1af3edb953f9 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sun, 17 May 2015 10:03:31 +0200 Subject: net/asterisk-11.x: Bump again to 11.17.1 (cross compile fix included) Signed-off-by: Sebastian Kemper --- net/asterisk-11.x/Makefile | 6 +++--- .../010-asterisk-configure-undef-res-ninit.patch | 2 +- .../022-asterisk-11.17.1-fix-cross-compile.patch | 11 +++++++++++ .../patches/030-srtp-fix-key-lifetime.patch | 12 ------------ .../patches/100-AST-2015-003-11.6.patch | 22 ---------------------- 5 files changed, 15 insertions(+), 38 deletions(-) create mode 100644 net/asterisk-11.x/patches/022-asterisk-11.17.1-fix-cross-compile.patch delete mode 100644 net/asterisk-11.x/patches/030-srtp-fix-key-lifetime.patch delete mode 100644 net/asterisk-11.x/patches/100-AST-2015-003-11.6.patch diff --git a/net/asterisk-11.x/Makefile b/net/asterisk-11.x/Makefile index b64bc2f..a9de21b 100644 --- a/net/asterisk-11.x/Makefile +++ b/net/asterisk-11.x/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=asterisk11 -PKG_VERSION:=11.16.0 -PKG_RELEASE:=4 +PKG_VERSION:=11.17.1 +PKG_RELEASE:=1 PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://downloads.asterisk.org/pub/telephony/asterisk/releases/ -PKG_MD5SUM:=de06d4ac0d1ba531c4c18805a9d5a18d +PKG_MD5SUM:=2c6cd0f499152d0d5ff32f36e274fc2e PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING LICENSE diff --git a/net/asterisk-11.x/patches/010-asterisk-configure-undef-res-ninit.patch b/net/asterisk-11.x/patches/010-asterisk-configure-undef-res-ninit.patch index 49d2604..5779714 100644 --- a/net/asterisk-11.x/patches/010-asterisk-configure-undef-res-ninit.patch +++ b/net/asterisk-11.x/patches/010-asterisk-configure-undef-res-ninit.patch @@ -1,6 +1,6 @@ --- a/configure +++ b/configure -@@ -16464,7 +16464,6 @@ if ac_fn_c_try_link "$LINENO"; then : +@@ -16533,7 +16533,6 @@ if ac_fn_c_try_link "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } diff --git a/net/asterisk-11.x/patches/022-asterisk-11.17.1-fix-cross-compile.patch b/net/asterisk-11.x/patches/022-asterisk-11.17.1-fix-cross-compile.patch new file mode 100644 index 0000000..eff0081 --- /dev/null +++ b/net/asterisk-11.x/patches/022-asterisk-11.17.1-fix-cross-compile.patch @@ -0,0 +1,11 @@ +--- a/Makefile ++++ b/Makefile +@@ -901,7 +901,7 @@ nmenuselect: menuselect/nmenuselect menu + -@menuselect/nmenuselect menuselect.makeopts && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!" + + # options for make in menuselect/ +-MAKE_MENUSELECT=CC="$(CC)" CXX="$(CXX)" LD="" AR="" RANLIB="" \ ++MAKE_MENUSELECT=CC="$(BUILD_CC)" CXX="$(CXX)" LD="" AR="" RANLIB="" \ + CFLAGS="$(BUILD_CFLAGS)" LDFLAGS="$(BUILD_LDFLAGS)" \ + $(MAKE) -C menuselect CONFIGURE_SILENT="--silent" + diff --git a/net/asterisk-11.x/patches/030-srtp-fix-key-lifetime.patch b/net/asterisk-11.x/patches/030-srtp-fix-key-lifetime.patch deleted file mode 100644 index fbebb1e..0000000 --- a/net/asterisk-11.x/patches/030-srtp-fix-key-lifetime.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/channels/sip/sdp_crypto.c -+++ b/channels/sip/sdp_crypto.c -@@ -252,8 +252,7 @@ - lifetime = strsep(&info, "|"); - - if (lifetime) { -+ ast_log(LOG_NOTICE, "Crypto life time unsupported: %s. Ignoring.\n", attr); -- ast_log(LOG_NOTICE, "Crypto life time unsupported: %s\n", attr); -- continue; - } - - found = 1; diff --git a/net/asterisk-11.x/patches/100-AST-2015-003-11.6.patch b/net/asterisk-11.x/patches/100-AST-2015-003-11.6.patch deleted file mode 100644 index e0f4772..0000000 --- a/net/asterisk-11.x/patches/100-AST-2015-003-11.6.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: main/tcptls.c -=================================================================== ---- a/main/tcptls.c (revision 433338) -+++ b/main/tcptls.c (working copy) -@@ -639,9 +639,15 @@ - break; - } - str = X509_NAME_ENTRY_get_data(X509_NAME_get_entry(name, pos)); -- ASN1_STRING_to_UTF8(&str2, str); -+ ret = ASN1_STRING_to_UTF8(&str2, str); -+ if (ret < 0) { -+ continue; -+ } -+ - if (str2) { -- if (!strcasecmp(tcptls_session->parent->hostname, (char *) str2)) { -+ if (strlen((char *) str2) != ret) { -+ ast_log(LOG_WARNING, "Invalid certificate common name length (contains NULL bytes?)\n"); -+ } else if (!strcasecmp(tcptls_session->parent->hostname, (char *) str2)) { - found = 1; - } - ast_debug(3, "SSL Common Name compare s1='%s' s2='%s'\n", tcptls_session->parent->hostname, str2); -- cgit From 8885c6784ccfb9381d7acb950255f9f7a84f1db2 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Fri, 19 Jun 2015 04:42:39 +0200 Subject: asterisk-11.x: update to 11.18.0 Signed-off-by: Daniel Golle --- net/asterisk-11.x/Makefile | 12 ++++++------ .../patches/001-pjproject-change-configure-args.patch | 2 +- .../patches/010-asterisk-configure-undef-res-ninit.patch | 2 +- .../patches/022-asterisk-11.17.1-fix-cross-compile.patch | 11 ----------- 4 files changed, 8 insertions(+), 19 deletions(-) delete mode 100644 net/asterisk-11.x/patches/022-asterisk-11.17.1-fix-cross-compile.patch diff --git a/net/asterisk-11.x/Makefile b/net/asterisk-11.x/Makefile index a9de21b..6e2cf57 100644 --- a/net/asterisk-11.x/Makefile +++ b/net/asterisk-11.x/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=asterisk11 -PKG_VERSION:=11.17.1 +PKG_VERSION:=11.18.0 PKG_RELEASE:=1 PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://downloads.asterisk.org/pub/telephony/asterisk/releases/ -PKG_MD5SUM:=2c6cd0f499152d0d5ff32f36e274fc2e +PKG_MD5SUM:=3ddb42b54db200faccd68906df210a40 PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING LICENSE @@ -289,13 +289,13 @@ define Build/Configure endef define Build/Compile - $(MAKE) -C "$(PKG_BUILD_DIR)" \ + ( retry=""; while [ ! "$$$$retry" ] && ! $(MAKE) -C "$(PKG_BUILD_DIR)" \ include/asterisk/version.h \ include/asterisk/buildopts.h defaults.h \ - makeopts.embed_rules + makeopts.embed_rules; do retry=1; done ) ASTCFLAGS="$(EXTRA_CFLAGS) -DLOW_MEMORY" ASTLDFLAGS="$(EXTRA_LDFLAGS)" - $(MAKE) -C "$(PKG_BUILD_DIR)" \ + ( retry=""; while [ ! "$$$$retry" ] && ! $(MAKE) -C "$(PKG_BUILD_DIR)" \ ASTVARLIBDIR="/usr/lib/asterisk" \ ASTDATADIR="/usr/lib/asterisk" \ ASTKEYDIR="/usr/lib/asterisk" \ @@ -304,7 +304,7 @@ define Build/Compile DEBUG="" \ OPTIMIZE="" \ DESTDIR="$(PKG_INSTALL_DIR)" \ - all install samples + all install samples; do retry=1; done ) endef define Build/InstallDev diff --git a/net/asterisk-11.x/patches/001-pjproject-change-configure-args.patch b/net/asterisk-11.x/patches/001-pjproject-change-configure-args.patch index 761dd5d..335a6bd 100644 --- a/net/asterisk-11.x/patches/001-pjproject-change-configure-args.patch +++ b/net/asterisk-11.x/patches/001-pjproject-change-configure-args.patch @@ -1,6 +1,6 @@ --- a/res/Makefile +++ b/res/Makefile -@@ -75,7 +75,7 @@ dist-clean:: +@@ -78,7 +78,7 @@ distclean:: rm -f pjproject/build.mak pjproject/build.mak: pjproject/aconfigure diff --git a/net/asterisk-11.x/patches/010-asterisk-configure-undef-res-ninit.patch b/net/asterisk-11.x/patches/010-asterisk-configure-undef-res-ninit.patch index 5779714..937ab0f 100644 --- a/net/asterisk-11.x/patches/010-asterisk-configure-undef-res-ninit.patch +++ b/net/asterisk-11.x/patches/010-asterisk-configure-undef-res-ninit.patch @@ -1,6 +1,6 @@ --- a/configure +++ b/configure -@@ -16533,7 +16533,6 @@ if ac_fn_c_try_link "$LINENO"; then : +@@ -16606,7 +16606,6 @@ if ac_fn_c_try_link "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } diff --git a/net/asterisk-11.x/patches/022-asterisk-11.17.1-fix-cross-compile.patch b/net/asterisk-11.x/patches/022-asterisk-11.17.1-fix-cross-compile.patch deleted file mode 100644 index eff0081..0000000 --- a/net/asterisk-11.x/patches/022-asterisk-11.17.1-fix-cross-compile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -901,7 +901,7 @@ nmenuselect: menuselect/nmenuselect menu - -@menuselect/nmenuselect menuselect.makeopts && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!" - - # options for make in menuselect/ --MAKE_MENUSELECT=CC="$(CC)" CXX="$(CXX)" LD="" AR="" RANLIB="" \ -+MAKE_MENUSELECT=CC="$(BUILD_CC)" CXX="$(CXX)" LD="" AR="" RANLIB="" \ - CFLAGS="$(BUILD_CFLAGS)" LDFLAGS="$(BUILD_LDFLAGS)" \ - $(MAKE) -C menuselect CONFIGURE_SILENT="--silent" - -- cgit From 23f36987b10c99018838ebe9092f35aa41af5a9e Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Fri, 19 Jun 2015 19:39:31 +0200 Subject: asterisk-11.x: build-depend on libxml2/host Signed-off-by: Daniel Golle --- net/asterisk-11.x/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/net/asterisk-11.x/Makefile b/net/asterisk-11.x/Makefile index 6e2cf57..3919731 100644 --- a/net/asterisk-11.x/Makefile +++ b/net/asterisk-11.x/Makefile @@ -16,12 +16,13 @@ PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://downloads.asterisk.org/pub/telephony/asterisk/releases/ PKG_MD5SUM:=3ddb42b54db200faccd68906df210a40 +PKG_BUILD_DIR=$(BUILD_DIR)/asterisk-$(PKG_VERSION) +PKG_BUILD_DEPENDS:=libxml2/host + PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING LICENSE PKG_MAINTAINER:=Jiri Slachta -PKG_BUILD_DIR=$(BUILD_DIR)/asterisk-$(PKG_VERSION) - include $(INCLUDE_DIR)/package.mk define Package/asterisk11/install/module -- cgit From 6108a76b16318f4affb13675f35c1d4e1732d364 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sun, 21 Jun 2015 21:03:00 +0200 Subject: asterisk-11.x: fix package build Clean up asterisk-11.x package and fix host-tools (menuselect) similar to how asterisk-13.x is built. Signed-off-by: Daniel Golle --- net/asterisk-11.x/Makefile | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/net/asterisk-11.x/Makefile b/net/asterisk-11.x/Makefile index 3919731..ccbc7a3 100644 --- a/net/asterisk-11.x/Makefile +++ b/net/asterisk-11.x/Makefile @@ -272,11 +272,19 @@ CONFIGURE_ARGS+= \ --with-sounds-cache="$(DL_DIR)" \ --disable-xmldoc -define Build/Prepare - $(call Build/Prepare/Default) -endef +CONFIGURE_VARS += \ + ac_cv_path_ac_pt_CONFIG_LIBXML2=$(STAGING_DIR)/host/bin/xml2-config + +AST_MENUSELECT_OPTS = \ + --without-newt \ + --without-curses \ + --with-ncurses="$(STAGING_DIR_HOST)/usr" \ + --with-libxml2="$(STAGING_DIR_HOST)/usr" define Build/Configure + (cd $(PKG_BUILD_DIR); \ + ./bootstrap.sh; \ + ); echo "export CFLAGS += $(FPIC) $(TARGET_CFLAGS) $(EXTRA_CFLAGS)"\ " $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)"\ > $(PKG_BUILD_DIR)/res/pjproject/user.mak; @@ -287,16 +295,26 @@ define Build/Configure " $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)"\ >> $(PKG_BUILD_DIR)/res/pjproject/user.mak; $(call Build/Configure/Default,,$(SITE_VARS)) + (cd $(PKG_BUILD_DIR)/menuselect; \ + ./bootstrap.sh; \ + ./configure \ + $(HOST_CONFIGURE_ARGS) \ + $(AST_MENUSELECT_OPTS) \ + LDFLAGS="$(HOST_LDFLAGS) -lxml2" \ + CFLAGS="$(HOST_CFLAGS) -I$(STAGING_DIR_HOST)/include/libxml2" \ + ); endef define Build/Compile - ( retry=""; while [ ! "$$$$retry" ] && ! $(MAKE) -C "$(PKG_BUILD_DIR)" \ - include/asterisk/version.h \ + $(MAKE) -C "$(PKG_BUILD_DIR)/menuselect" \ + CFLAGS="$(HOST_CFLAGS) -I$(STAGING_DIR_HOST)/include/libxml2" \ + LDFLAGS="$(HOST_LDFLAGS) -lxml2" + $(MAKE) -C "$(PKG_BUILD_DIR)" include/asterisk/version.h \ include/asterisk/buildopts.h defaults.h \ - makeopts.embed_rules; do retry=1; done ) + makeopts.embed_rules ASTCFLAGS="$(EXTRA_CFLAGS) -DLOW_MEMORY" ASTLDFLAGS="$(EXTRA_LDFLAGS)" - ( retry=""; while [ ! "$$$$retry" ] && ! $(MAKE) -C "$(PKG_BUILD_DIR)" \ + $(MAKE) -C "$(PKG_BUILD_DIR)" \ ASTVARLIBDIR="/usr/lib/asterisk" \ ASTDATADIR="/usr/lib/asterisk" \ ASTKEYDIR="/usr/lib/asterisk" \ @@ -305,7 +323,7 @@ define Build/Compile DEBUG="" \ OPTIMIZE="" \ DESTDIR="$(PKG_INSTALL_DIR)" \ - all install samples; do retry=1; done ) + all install samples endef define Build/InstallDev -- cgit From 2a5520857ae53f27d64f4bf96b1dfac860e51765 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Mon, 22 Jun 2015 23:34:59 +0200 Subject: asterisk-11x: Update 010-asterisk-configure-undef-res-ninit.patch Lately configure is recreated from configure.ac. The current patch changes configure. So we patch it, then it gets recreated and our change is gone. So patch configure.ac instead. Without this change the build fails due to an undefined reference to res_nsearch. Signed-off-by: Sebastian Kemper --- .../010-asterisk-configure-undef-res-ninit.patch | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/net/asterisk-11.x/patches/010-asterisk-configure-undef-res-ninit.patch b/net/asterisk-11.x/patches/010-asterisk-configure-undef-res-ninit.patch index 937ab0f..6ed9d07 100644 --- a/net/asterisk-11.x/patches/010-asterisk-configure-undef-res-ninit.patch +++ b/net/asterisk-11.x/patches/010-asterisk-configure-undef-res-ninit.patch @@ -1,10 +1,10 @@ ---- a/configure -+++ b/configure -@@ -16606,7 +16606,6 @@ if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } - --$as_echo "#define HAVE_RES_NINIT 1" >>confdefs.h - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing res_9_ndestroy" >&5 - $as_echo_n "checking for library containing res_9_ndestroy... " >&6; } +--- a/configure.ac ++++ b/configure.ac +@@ -1110,7 +1110,6 @@ AC_LINK_IFELSE( + #include ], + [int foo = res_ninit(NULL);])], + AC_MSG_RESULT(yes) +- AC_DEFINE([HAVE_RES_NINIT], 1, [Define to 1 if your system has the re-entrant resolver functions.]) + AC_SEARCH_LIBS(res_9_ndestroy, resolv) + AC_MSG_CHECKING(for res_ndestroy) + AC_LINK_IFELSE( -- cgit From e6f696f68ea96542f2630d9023a3d9960e8a879e Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Tue, 23 Jun 2015 02:07:52 +0200 Subject: asterisk-11.x: bump release Updating configure-undef-res-ninit.patch in commit 2060702 changed the resulting binaries on targets not previously failing to build without the change. Bump the package release to reflect that. Signed-off-by: Daniel Golle --- net/asterisk-11.x/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/asterisk-11.x/Makefile b/net/asterisk-11.x/Makefile index ccbc7a3..3b4b5ec 100644 --- a/net/asterisk-11.x/Makefile +++ b/net/asterisk-11.x/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=asterisk11 PKG_VERSION:=11.18.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://downloads.asterisk.org/pub/telephony/asterisk/releases/ -- cgit From f33dd1483c050d66ba70e718ec3126c9b223abe5 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Tue, 23 Jun 2015 21:08:23 +0200 Subject: asterisk-11.x: Don't bootstrap menuselect The configure script generated by bootstrap.sh in the menuselect folder doesn't work properly. It doesn't check for 'sed', for instance, resulting in './configure: line 4622: -e: command not found'. The build works well without the bootstrap. Signed-off-by: Sebastian Kemper --- net/asterisk-11.x/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/net/asterisk-11.x/Makefile b/net/asterisk-11.x/Makefile index 3b4b5ec..63621f4 100644 --- a/net/asterisk-11.x/Makefile +++ b/net/asterisk-11.x/Makefile @@ -296,7 +296,6 @@ define Build/Configure >> $(PKG_BUILD_DIR)/res/pjproject/user.mak; $(call Build/Configure/Default,,$(SITE_VARS)) (cd $(PKG_BUILD_DIR)/menuselect; \ - ./bootstrap.sh; \ ./configure \ $(HOST_CONFIGURE_ARGS) \ $(AST_MENUSELECT_OPTS) \ -- cgit From 2a342cd5bfe75e2da9a82ba0486d6aa4a852bb33 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Wed, 24 Jun 2015 17:44:30 +0200 Subject: kamailio-4.x: update to version 4.3.0 Signed-off-by: Daniel Golle --- net/kamailio-4.x/Makefile | 23 +++++++++++++++-------- net/kamailio-4.x/patches/120-libevent-libs.patch | 13 +++++++++++++ 2 files changed, 28 insertions(+), 8 deletions(-) create mode 100644 net/kamailio-4.x/patches/120-libevent-libs.patch diff --git a/net/kamailio-4.x/Makefile b/net/kamailio-4.x/Makefile index 886021f..1365fed 100644 --- a/net/kamailio-4.x/Makefile +++ b/net/kamailio-4.x/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=kamailio4 -PKG_VERSION:=4.2.4 +PKG_VERSION:=4.3.0 PKG_RELEASE:=1 PKG_SOURCE_URL:=http://www.kamailio.org/pub/kamailio/$(PKG_VERSION)/src/ PKG_SOURCE:=kamailio-$(PKG_VERSION)$(PKG_VARIANT)_src.tar.gz -PKG_MD5SUM:=6c10bc5c4c727bf2bddc8a37ef3f9ae6 +PKG_MD5SUM:=4a6bd2f70f14d94a4ed9a8e6b18f89d7 PKG_USE_MIPS16:=0 PKG_LICENSE:=GPL-2.0+ @@ -119,12 +119,13 @@ $(eval $(call BuildKamailio4Module,alias_db,Database-backend aliases,,+kamailio4 $(eval $(call BuildKamailio4Module,auth,Authentication Framework,,)) $(eval $(call BuildKamailio4Module,auth_db,Database-backend authentication,,+kamailio4-mod-auth +kamailio4-mod-db-sqlite)) $(eval $(call BuildKamailio4Module,auth_diameter,Diameter-backend authentication,,+kamailio4-mod-sl)) +$(eval $(call BuildKamailio4Module,auth_xkeys,Shared-key authentication,,+kamailio4-mod-auth)) $(eval $(call BuildKamailio4Module,avpops,AVP operation,,)) $(eval $(call BuildKamailio4Module,benchmark,Config benchmark,,)) $(eval $(call BuildKamailio4Module,cfgutils,Config utilities,,)) $(eval $(call BuildKamailio4Module,cfg_db,Load core and module parameters from database,,+kamailio4-mod-db-sqlite)) $(eval $(call BuildKamailio4Module,cfg_rpc,Update core and module parameters at runtime via RPC interface,,)) -$(eval $(call BuildKamailio4Module,cnxcc,Limit call duration,,+kamailio4-mod-dialog)) +$(eval $(call BuildKamailio4Module,cnxcc,Limit call duration,,+kamailio4-mod-dialog +libhiredis +libevent)) $(eval $(call BuildKamailio4Module,corex,Legacy functions,,)) $(eval $(call BuildKamailio4Module,ctl,BINRPC transport interface,,)) $(eval $(call BuildKamailio4Module,db_flatstore,Fast writing-only text database-backed,,)) @@ -143,13 +144,17 @@ $(eval $(call BuildKamailio4Module,domain,Multi-domain support,,)) $(eval $(call BuildKamailio4Module,domainpolicy,Domain policy,,)) $(eval $(call BuildKamailio4Module,drouting,Dynamic routing module,,)) $(eval $(call BuildKamailio4Module,enum,ENUM lookup,,)) +$(eval $(call BuildKamailio4Module,evapi,push event details via tcp,,+libev)) $(eval $(call BuildKamailio4Module,exec,External exec,,)) $(eval $(call BuildKamailio4Module,group,Database-backend user-groups,,)) $(eval $(call BuildKamailio4Module,h350,H.350,,+kamailio4-mod-ldap +libopenldap)) $(eval $(call BuildKamailio4Module,htable,Hash Table,,)) $(eval $(call BuildKamailio4Module,imc,IM conferencing,,+kamailio4-mod-db-mysql +kamailio4-mod-tm)) $(eval $(call BuildKamailio4Module,ipops,IP and IPv6 operations,,)) +$(eval $(call BuildKamailio4Module,jansson,Alternative access to JSON document attributes,,+jansson)) +# $(eval $(call BuildKamailio4Module,janssonrpc-c,Alternative JSONRPC server,,+kamailio4-mod-jansson +libevent2)) $(eval $(call BuildKamailio4Module,json,Access to JSON document attributes,,+libjson-c)) +$(eval $(call BuildKamailio4Module,jsonrpc-s,JSONRPC server over HTTP,,+kamailio4-mod-json +libevent)) $(eval $(call BuildKamailio4Module,kex,Core extensions,,)) $(eval $(call BuildKamailio4Module,lcr,Least Cost Routing,,+kamailio4-mod-tm +libpcre)) $(eval $(call BuildKamailio4Module,ldap,LDAP connector,,+libopenldap)) @@ -162,6 +167,7 @@ $(eval $(call BuildKamailio4Module,msilo,SIP message silo,,+kamailio4-mod-tm)) $(eval $(call BuildKamailio4Module,msrp,MSRP routing engine,,+kamailio4-mod-tls)) $(eval $(call BuildKamailio4Module,nathelper,NAT helper,,+kamailio4-mod-usrloc)) $(eval $(call BuildKamailio4Module,nat_traversal,NAT traversal,,+kamailio4-mod-dialog +kamailio4-mod-sl +kamailio4-mod-tm)) +$(eval $(call BuildKamailio4Module,nosip,non-sip package handling,,+kamailio4-mod-rr)) $(eval $(call BuildKamailio4Module,path,SIP path insertion,,+kamailio4-mod-rr)) $(eval $(call BuildKamailio4Module,pdt,Prefix-to-Domain translator,,)) $(eval $(call BuildKamailio4Module,permissions,Permissions control,,)) @@ -187,6 +193,7 @@ $(eval $(call BuildKamailio4Module,rtimer,Routing Timer,,)) $(eval $(call BuildKamailio4Module,rtpengine,RTP engine,,+kamailio4-mod-tm)) $(eval $(call BuildKamailio4Module,rtpproxy,RTP proxy,,+kamailio4-mod-tm)) $(eval $(call BuildKamailio4Module,sanity,SIP sanity checks,,+kamailio4-mod-sl)) +$(eval $(call BuildKamailio4Module,sctp,SCTP support,,+libsctp)) $(eval $(call BuildKamailio4Module,sipcapture,SIP capture,,)) $(eval $(call BuildKamailio4Module,siptrace,SIP trace,,)) $(eval $(call BuildKamailio4Module,siputils,SIP utilities,,+kamailio4-mod-sl)) @@ -197,6 +204,7 @@ $(eval $(call BuildKamailio4Module,sqlops,SQL operations,,)) $(eval $(call BuildKamailio4Module,statistics,Script statistics,,)) $(eval $(call BuildKamailio4Module,stun,STUN server support,,)) $(eval $(call BuildKamailio4Module,sst,SIP Session Timer,,+kamailio4-mod-dialog +kamailio4-mod-sl)) +$(eval $(call BuildKamailio4Module,tcpops,TCP options tweaking operations,,)) $(eval $(call BuildKamailio4Module,textops,Text operations,,)) $(eval $(call BuildKamailio4Module,tls,TLS operations,,+libopenssl)) $(eval $(call BuildKamailio4Module,topoh,Topology hiding,,+kamailio4-mod-rr)) @@ -208,6 +216,7 @@ $(eval $(call BuildKamailio4Module,uri_db,Database-backend SIP URI checking,,)) $(eval $(call BuildKamailio4Module,userblacklist,User blacklists,,)) $(eval $(call BuildKamailio4Module,usrloc,User location,,)) $(eval $(call BuildKamailio4Module,utils,Misc utilities,,+libcurl +libxml2)) +$(eval $(call BuildKamailio4Module,uuid,UUID utilities,,+libuuid)) $(eval $(call BuildKamailio4Module,xcap_client,XCAP Client,,+libcurl)) $(eval $(call BuildKamailio4Module,xlog,Advanced logger,,)) $(eval $(call BuildKamailio4Module,xmlrpc,XML RPC module,,+libxml2)) @@ -233,14 +242,12 @@ PKG_MAKE_ARGS:= \ CC="$(TARGET_CC)" \ ARCH="$(ARCH)" \ DESTDIR=$(PKG_INSTALL_DIR) \ + EXTRA_LIBS="-L$(STAGING_DIR)/usr/lib/ -L$(STAGING_DIR)/usr/lib/libevent" \ quiet=verbose define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) $(PKG_MAKE_ARGS) \ - EXTRA_LIBS=-L$(STAGING_DIR)/usr/lib/ \ - all - $(MAKE) -C $(PKG_BUILD_DIR) $(PKG_MAKE_ARGS) \ - install + $(MAKE) -C $(PKG_BUILD_DIR) $(PKG_MAKE_ARGS) all + $(MAKE) -C $(PKG_BUILD_DIR) $(PKG_MAKE_ARGS) install endef $(eval $(call BuildPackage,kamailio4)) diff --git a/net/kamailio-4.x/patches/120-libevent-libs.patch b/net/kamailio-4.x/patches/120-libevent-libs.patch new file mode 100644 index 0000000..f4d6569 --- /dev/null +++ b/net/kamailio-4.x/patches/120-libevent-libs.patch @@ -0,0 +1,13 @@ +Index: kamailio4-4.3.0/modules/cnxcc/Makefile +=================================================================== +--- kamailio4-4.3.0.orig/modules/cnxcc/Makefile ++++ kamailio4-4.3.0/modules/cnxcc/Makefile +@@ -8,7 +8,7 @@ include ../../Makefile.defs + auto_gen= + NAME=cnxcc.so + +-LIBS=-lhiredis -levent ++LIBS=-lhiredis -levent $(EXTRA_LIBS) + DEFS+=-DOPENSER_MOD_INTERFACE + SERLIBPATH=../../lib + SER_LIBS+=$(SERLIBPATH)/kmi/kmi -- cgit From f0bb800287e18dac443314f8b577fd9fd85faaf2 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Wed, 24 Jun 2015 20:50:09 +0200 Subject: asterisk-11.x-chan-dongle: fix audio endianess problem Github user @ljakob supplied a patch in https://github.com/openwrt/telephony/issues/7 -- Hi, I've solved the problem myself - it was an endianness bug: Here what gave me the correct clue: audio is broken in one direction only audio is fine if you disable any timing-source within asterisk (no good idea if you want to use IAX) audio was fine on my x86 box I had a long look into the code :) The bug is in the audio handling of timing_write in channel.c, the data sent to the socket is not changed to the correct endianness if a timing device is used. Here is my patch, it's untested (just one call yet) but it's trivial enough: http://www.hugo.weite-welt.com/asterisk13_chan_dongle_endianess.patch it is against asterisk13 branch in https://github.com/oleg-krv/asterisk-chan-dongle.git but should fit into other asterisk versions nicely -- This commit imports the patch above to asterisk-11.x-chan-dongle. Signed-off-by: Daniel Golle --- net/asterisk-11.x-chan-dongle/Makefile | 2 +- .../100-fix-audio-on-big-endian-systems.patch | 48 ++++++++++++++++++++++ 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 net/asterisk-11.x-chan-dongle/patches/100-fix-audio-on-big-endian-systems.patch diff --git a/net/asterisk-11.x-chan-dongle/Makefile b/net/asterisk-11.x-chan-dongle/Makefile index 4927822..c00711e 100644 --- a/net/asterisk-11.x-chan-dongle/Makefile +++ b/net/asterisk-11.x-chan-dongle/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=asterisk11-chan-dongle PKG_VERSION:=1.1r35 PKG_REV:=28a46567a88cebdc365db6f294e682246fd2dd7b -PKG_RELEASE:=3 +PKG_RELEASE:=5 PKG_SOURCE_SUBDIR:=asterisk11-chan-dongle-$(PKG_VERSION) PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz diff --git a/net/asterisk-11.x-chan-dongle/patches/100-fix-audio-on-big-endian-systems.patch b/net/asterisk-11.x-chan-dongle/patches/100-fix-audio-on-big-endian-systems.patch new file mode 100644 index 0000000..3fc546d --- /dev/null +++ b/net/asterisk-11.x-chan-dongle/patches/100-fix-audio-on-big-endian-systems.patch @@ -0,0 +1,48 @@ +Index: asterisk11-chan-dongle-1.1r35/channel.c +=================================================================== +--- asterisk11-chan-dongle-1.1r35.orig/channel.c ++++ asterisk11-chan-dongle-1.1r35/channel.c +@@ -495,6 +495,19 @@ again: + } + } + ++// see https://github.com/openwrt/telephony/issues/7 ++static inline void change_audio_endianness_to_le(struct iovec *iov, int iovcnt) ++{ ++#if __BYTE_ORDER == __LITTLE_ENDIAN ++ return; // nothing to do ++#else ++ for(;iovcnt-->0;iov++) ++ { ++ ast_swapcopy_samples(iov->iov_base, iov->iov_base, iov->iov_len/2); ++ } ++#endif ++} ++ + #/* */ + static void timing_write (struct pvt* pvt) + { +@@ -522,6 +535,7 @@ static void timing_write (struct pvt* pv + iovcnt = mixb_read_n_iov (&pvt->a_write_mixb, iov, FRAME_SIZE); + mixb_read_n_iov (&pvt->a_write_mixb, iov, FRAME_SIZE); + mixb_read_upd (&pvt->a_write_mixb, FRAME_SIZE); ++ change_audio_endianness_to_le(iov, iovcnt); + } + else if (used > 0) + { +@@ -535,6 +549,7 @@ static void timing_write (struct pvt* pv + iov[iovcnt].iov_base = silence_frame; + iov[iovcnt].iov_len = FRAME_SIZE - used; + iovcnt++; ++ change_audio_endianness_to_le(iov, iovcnt); + } + else + { +@@ -544,6 +559,7 @@ static void timing_write (struct pvt* pv + iov[0].iov_base = silence_frame; + iov[0].iov_len = FRAME_SIZE; + iovcnt = 1; ++ // ignore endianness for zeros + // continue; + } + -- cgit From aed7857cee85ad067ba786e5d0c708eda76420c4 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Wed, 24 Jun 2015 21:08:16 +0200 Subject: asterisk-11.x-chan-dongle: support E1752 and refresh patches Signed-off-by: Daniel Golle --- net/asterisk-11.x-chan-dongle/Makefile | 2 +- .../patches/001-add-send-ussd.patch | 4 ++-- .../patches/050-add-E1752-to-seven_bit_modems.patch | 19 +++++++++++++++++++ .../patches/051-bump-package-revision.patch | 20 ++++++++++++++++++++ .../100-fix-audio-on-big-endian-systems.patch | 6 ++---- 5 files changed, 44 insertions(+), 7 deletions(-) create mode 100644 net/asterisk-11.x-chan-dongle/patches/050-add-E1752-to-seven_bit_modems.patch create mode 100644 net/asterisk-11.x-chan-dongle/patches/051-bump-package-revision.patch diff --git a/net/asterisk-11.x-chan-dongle/Makefile b/net/asterisk-11.x-chan-dongle/Makefile index c00711e..9fb409d 100644 --- a/net/asterisk-11.x-chan-dongle/Makefile +++ b/net/asterisk-11.x-chan-dongle/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=asterisk11-chan-dongle PKG_VERSION:=1.1r35 PKG_REV:=28a46567a88cebdc365db6f294e682246fd2dd7b -PKG_RELEASE:=5 +PKG_RELEASE:=6 PKG_SOURCE_SUBDIR:=asterisk11-chan-dongle-$(PKG_VERSION) PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz diff --git a/net/asterisk-11.x-chan-dongle/patches/001-add-send-ussd.patch b/net/asterisk-11.x-chan-dongle/patches/001-add-send-ussd.patch index 4ea41b1..bc59bf9 100644 --- a/net/asterisk-11.x-chan-dongle/patches/001-add-send-ussd.patch +++ b/net/asterisk-11.x-chan-dongle/patches/001-add-send-ussd.patch @@ -1,6 +1,6 @@ --- a/app.c +++ b/app.c -@@ -114,7 +114,44 @@ +@@ -114,7 +114,44 @@ static int app_send_sms_exec (attribute_ return !status; } @@ -45,7 +45,7 @@ static const struct dongle_application { -@@ -144,7 +181,15 @@ +@@ -144,7 +181,15 @@ static const struct dongle_application " Message - text of the message\n" " Validity - Validity period in minutes\n" " Report - Boolean flag for report request\n" diff --git a/net/asterisk-11.x-chan-dongle/patches/050-add-E1752-to-seven_bit_modems.patch b/net/asterisk-11.x-chan-dongle/patches/050-add-E1752-to-seven_bit_modems.patch new file mode 100644 index 0000000..a2c490c --- /dev/null +++ b/net/asterisk-11.x-chan-dongle/patches/050-add-E1752-to-seven_bit_modems.patch @@ -0,0 +1,19 @@ +From da5cd41e8554eaf1133f85282c253da2c74ff7eb Mon Sep 17 00:00:00 2001 +From: "bg_one@mail.ru" +Date: Fri, 6 Sep 2013 19:37:05 +0000 +Subject: [PATCH] added E1752 to seven_bit_modems + +--- + at_response.c | 1 + + 1 files changed, 1 insertions(+), 0 deletion(-) + +--- a/at_response.c ++++ b/at_response.c +@@ -1590,6 +1590,7 @@ static int at_response_cgmm (struct pvt* + "E171", + "E153", + "E156B", ++ "E1752", + }; + + ast_copy_string (pvt->model, str, sizeof (pvt->model)); diff --git a/net/asterisk-11.x-chan-dongle/patches/051-bump-package-revision.patch b/net/asterisk-11.x-chan-dongle/patches/051-bump-package-revision.patch new file mode 100644 index 0000000..3d85dd6 --- /dev/null +++ b/net/asterisk-11.x-chan-dongle/patches/051-bump-package-revision.patch @@ -0,0 +1,20 @@ +From da5cd41e8554eaf1133f85282c253da2c74ff7eb Mon Sep 17 00:00:00 2001 +From: "bg_one@mail.ru" +Date: Fri, 6 Sep 2013 19:37:05 +0000 +Subject: [PATCH] added E1752 to seven_bit_modems + +--- + configure.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletion(-) + +--- a/configure.in ++++ b/configure.in +@@ -2,7 +2,7 @@ dnl init + dnl AC_REVISION($Revision: 1.30 $) + AC_PREREQ([2.60]) + AC_INIT([chan_dongle],[1.1],[http://code.google.com/p/asterisk-chan-dongle/issues/list],[chan_dongle],[http://code.google.com/p/asterisk-chan-dongle]) +-PACKAGE_REVISION="34" ++PACKAGE_REVISION="35" + AC_CANONICAL_TARGET + AM_INIT_AUTOMAKE + AC_CONFIG_HEADERS([config.h]) diff --git a/net/asterisk-11.x-chan-dongle/patches/100-fix-audio-on-big-endian-systems.patch b/net/asterisk-11.x-chan-dongle/patches/100-fix-audio-on-big-endian-systems.patch index 3fc546d..a6b1c07 100644 --- a/net/asterisk-11.x-chan-dongle/patches/100-fix-audio-on-big-endian-systems.patch +++ b/net/asterisk-11.x-chan-dongle/patches/100-fix-audio-on-big-endian-systems.patch @@ -1,7 +1,5 @@ -Index: asterisk11-chan-dongle-1.1r35/channel.c -=================================================================== ---- asterisk11-chan-dongle-1.1r35.orig/channel.c -+++ asterisk11-chan-dongle-1.1r35/channel.c +--- a/channel.c ++++ b/channel.c @@ -495,6 +495,19 @@ again: } } -- cgit From 2ef1bfad239604619535565e52dcd8789f07d4c0 Mon Sep 17 00:00:00 2001 From: Diederik de Groot Date: Thu, 25 Jun 2015 17:19:46 +0200 Subject: Add realtime pbx, func and res modules --- net/asterisk-11.x/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/asterisk-11.x/Makefile b/net/asterisk-11.x/Makefile index 63621f4..66181cc 100644 --- a/net/asterisk-11.x/Makefile +++ b/net/asterisk-11.x/Makefile @@ -413,6 +413,7 @@ $(eval $(call BuildAsterisk11Module,func-module,Simple module check function,Sim $(eval $(call BuildAsterisk11Module,func-shell,Shell,support for shell execution,,,,func_shell,)) $(eval $(call BuildAsterisk11Module,func-uri,URI encoding and decoding,Encodes and decodes URI-safe strings,,,,func_uri,)) $(eval $(call BuildAsterisk11Module,func-vmcount,vmcount dialplan,a vmcount dialplan function,,,,func_vmcount,)) +$(eval $(call BuildAsterisk11Module,func-realtime,realtime dialplan,the realtime dialplan function,,,,func_realtime,)) $(eval $(call BuildAsterisk11Module,chan-agent,Agents proxy channel,an implementation of agents proxy channel,,,,chan_agent,)) $(eval $(call BuildAsterisk11Module,chan-dahdi,DAHDI channel,DAHDI channel support,+dahdi-tools-libtonezone +kmod-dahdi,/etc/asterisk/chan_dahdi.conf,chan_dahdi.conf,chan_dahdi,)) $(eval $(call BuildAsterisk11Module,chan-iax2,IAX2 channel,IAX support,+asterisk11-res-timing-timerfd,/etc/asterisk/iax.conf /etc/asterisk/iaxprov.conf,iax.conf iaxprov.conf,chan_iax2,)) @@ -426,6 +427,7 @@ $(eval $(call BuildAsterisk11Module,pbx-ael,Asterisk Extension Logic,support for $(eval $(call BuildAsterisk11Module,pbx-dundi,Dundi,provides Dundi Lookup service for Asterisk,,/etc/asterisk/dundi.conf,dundi.conf,pbx_dundi,)) $(eval $(call BuildAsterisk11Module,pbx-lua,Lua,provides Lua resources for Asterisk,+libpthread +libc +liblua,/etc/asterisk/extensions.lua,extensions.lua,pbx_lua,)) $(eval $(call BuildAsterisk11Module,pbx-spool,Call Spool,outgoing call spool support,,,,pbx_spool,)) +$(eval $(call BuildAsterisk11Module,pbx-realtime,Realtime Switch,realtime switch support,,,,pbx_realtime,)) $(eval $(call BuildAsterisk11Module,pgsql,PostgreSQL,PostgreSQL support,+libpq,/etc/asterisk/cel_pgsql.conf /etc/asterisk/cdr_pgsql.conf /etc/asterisk/res_pgsql.conf,cel_pgsql.conf cdr_pgsql.conf res_pgsql.conf,cel_pgsql cdr_pgsql res_config_pgsql,)) $(eval $(call BuildAsterisk11Module,res-ael-share,Shareable AEL code,support for shareable AEL code mainly between internal and external modules,,,,res_ael_share,)) $(eval $(call BuildAsterisk11Module,res-agi,Asterisk Gateway Interface,Support for the Asterisk Gateway Interface extension,,,,res_agi,)) @@ -442,4 +444,5 @@ $(eval $(call BuildAsterisk11Module,res-timing-dahdi,DAHDI Timing Interface,,+as $(eval $(call BuildAsterisk11Module,res-timing-pthread,pthread Timing Interface,,,,,res_timing_pthread,)) $(eval $(call BuildAsterisk11Module,res-timing-timerfd,Timerfd Timing Interface,,,,,res_timing_timerfd,)) #$(eval $(call BuildAsterisk11Module,res-xmpp,XMPP,XMPP/Jabber support,+libiksemel,,,res_xmpp,)) +$(eval $(call BuildAsterisk11Module,res-realtime,Realtime Interface,,,,,res_realtime,)) $(eval $(call BuildAsterisk11Module,voicemail,Voicemail,voicemail related modules,,/etc/asterisk/voicemail.conf,voicemail.conf,*voicemail res_adsi res_smdi,vm-*)) -- cgit From 96a8393ab839f9f924d75b9dcc1d0ffc3d5dbc31 Mon Sep 17 00:00:00 2001 From: Diederik de Groot Date: Thu, 25 Jun 2015 17:22:10 +0200 Subject: Add realtime pbx, func and res modules --- net/asterisk-13.x/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/net/asterisk-13.x/Makefile b/net/asterisk-13.x/Makefile index c5e5b30..a47d74e 100644 --- a/net/asterisk-13.x/Makefile +++ b/net/asterisk-13.x/Makefile @@ -359,6 +359,10 @@ $(eval $(call BuildAsterisk13Module,func-realtime,realtime,the realtime dialplan $(eval $(call BuildAsterisk13Module,func-shell,Shell,support for shell execution,,,func_shell,,)) $(eval $(call BuildAsterisk13Module,func-uri,URI encoding and decoding,Encodes and decodes URI-safe strings,,,func_uri,,)) $(eval $(call BuildAsterisk13Module,func-vmcount,vmcount dialplan,a vmcount dialplan function,,,func_vmcount,,)) +$(eval $(call BuildAsterisk13Module,chan-iax2,IAX2 channel,IAX support,+asterisk13-res-timing-timerfd,iax.conf iaxprov.conf,chan_iax2,,)) +$(eval $(call BuildAsterisk13Module,chan-sip,SIP channel,the channel chan_sip,+asterisk13-app-confbridge,sip.conf sip_notify.conf,chan_sip,,)) +$(eval $(call BuildAsterisk13Module,chan-skinny,Skinny channel,the channel chan_skinny,,skinny.conf,chan_skinny,,)) +$(eval $(call BuildAsterisk13Module,chan-unistim,Unistim channel,channel driver for the UNISTIM (Unified Networks IP Stimulus) protocol,,unistim.conf,chan_unistim,,)) $(eval $(call BuildAsterisk13Module,odbc,ODBC,ODBC support,+libpthread +libc +unixodbc,cdr_adaptive_odbc.conf cdr_odbc.conf cel_odbc.conf func_odbc.conf res_odbc.conf,cdr_adaptive_odbc cdr_odbc cel_odbc func_odbc res_config_odbc res_odbc,,)) $(eval $(call BuildAsterisk13Module,pbx-ael,Asterisk Extension Logic,support for symbolic Asterisk Extension Logic,,extensions.ael,pbx_ael,,)) $(eval $(call BuildAsterisk13Module,pbx-dundi,Dundi,provides Dundi Lookup service for Asterisk,,dundi.conf,pbx_dundi,,)) @@ -381,6 +385,7 @@ $(eval $(call BuildAsterisk13Module,res-realtime,Realtime,Realtime Interface,,,r $(eval $(call BuildAsterisk13Module,res-rtp-asterisk,RTP stack,,+libpjsip +libpjmedia +libpjnath +libpjsip-simple +libpjsip-ua +libpjsua +libpjsua2,rtp.conf,res_rtp_asterisk,,)) $(eval $(call BuildAsterisk13Module,res-rtp-multicast,RTP multicast engine,,,,res_rtp_multicast,,)) $(eval $(call BuildAsterisk13Module,res-smdi,Provide SMDI,Simple Message Desk Interface capability,,smdi.conf,res_smdi,,)) +$(eval $(call BuildAsterisk13Module,res-realtime,Realtime,Realtime Interface,,,,res_realtime,,)) $(eval $(call BuildAsterisk13Module,res-sorcery,Sorcery data layer,,,,res_sorcery_astdb res_sorcery_config res_sorcery_memory res_sorcery_realtime,,)) $(eval $(call BuildAsterisk13Module,res-srtp,SRTP Support,Secure RTP connection,+libsrtp,,res_srtp,,)) $(eval $(call BuildAsterisk13Module,res-timing-pthread,pthread Timing Interface,,,,res_timing_pthread,,)) -- cgit From 46a7e1e5c070d84731a09a159c9097b02c631479 Mon Sep 17 00:00:00 2001 From: Diederik de Groot Date: Thu, 25 Jun 2015 17:28:59 +0200 Subject: chan-sccp-b: - Update revision to point to stable V4.2 release - Add sqlite3 realtime example files --- net/chan-sccp-b/Makefile | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/net/chan-sccp-b/Makefile b/net/chan-sccp-b/Makefile index 0dbfb52..b7d3d34 100644 --- a/net/chan-sccp-b/Makefile +++ b/net/chan-sccp-b/Makefile @@ -98,11 +98,14 @@ define Package/Install/Default $(INSTALL_DIR) $(1)/etc/asterisk $(CP) ./files/sccp.conf $(1)/etc/asterisk/sccp.conf $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_sccp.so $(1)/usr/lib/asterisk/modules/ - $(INSTALL_DATA) ./files/extconfig.conf.sccp_sample $(1)/etc/asterisk/extconfig.conf.sccp_sample - $(INSTALL_DATA) ./files/res_config_sqlite3.conf.sccp_sample $(1)/etc/asterisk/res_config_sqlite3.conf.sccp_sample - $(INSTALL_DATA) ./files/sccp_sqlite3.sql $(1)/etc/asterisk/sccp_sqlite3.sql - $(INSTALL_DATA) ./files/sccp.conf.realtime_sample $(1)/etc/asterisk/sccp.conf.realtime_sample + $(CP) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_sccp.so $(1)/usr/lib/asterisk/modules/ + if [ -f /usr/bin/sqlite3 ]; then + $(CP) ./files/extconfig.conf.sccp_sample $(1)/etc/asterisk/extconfig.conf.sccp_sample + $(CP) ./files/res_config_sqlite3.conf.sccp_sample $(1)/etc/asterisk/res_config_sqlite3.conf.sccp_sample + $(CP) ./files/sccp_sqlite3.sql $(1)/etc/asterisk/sccp_sqlite3.sql + $(CP) ./files/sccp.conf.realtime_sample $(1)/etc/asterisk/sccp.conf.realtime_sample + /usr/bin/sqlite3 /usr/lib/asterisk/realtime.sqlite3 < /etc/asterisk/sccp_sqlite3.sql + fi endef Package/asterisk18-chan-sccp-b/install = $(Package/Install/Default) -- cgit From 62159ffc0954937f34c1ac8391e9081a768e065f Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Fri, 26 Jun 2015 00:13:37 +0200 Subject: asterisk-13.x: fixup real-time module remove spurious ',' sign added in commit a386bb33c7e519871e01e9a6ab7adb30bd002952 Signed-off-by: Daniel Golle --- net/asterisk-13.x/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/asterisk-13.x/Makefile b/net/asterisk-13.x/Makefile index a47d74e..3bbbfd3 100644 --- a/net/asterisk-13.x/Makefile +++ b/net/asterisk-13.x/Makefile @@ -385,7 +385,7 @@ $(eval $(call BuildAsterisk13Module,res-realtime,Realtime,Realtime Interface,,,r $(eval $(call BuildAsterisk13Module,res-rtp-asterisk,RTP stack,,+libpjsip +libpjmedia +libpjnath +libpjsip-simple +libpjsip-ua +libpjsua +libpjsua2,rtp.conf,res_rtp_asterisk,,)) $(eval $(call BuildAsterisk13Module,res-rtp-multicast,RTP multicast engine,,,,res_rtp_multicast,,)) $(eval $(call BuildAsterisk13Module,res-smdi,Provide SMDI,Simple Message Desk Interface capability,,smdi.conf,res_smdi,,)) -$(eval $(call BuildAsterisk13Module,res-realtime,Realtime,Realtime Interface,,,,res_realtime,,)) +$(eval $(call BuildAsterisk13Module,res-realtime,Realtime,Realtime Interface,,,res_realtime,,)) $(eval $(call BuildAsterisk13Module,res-sorcery,Sorcery data layer,,,,res_sorcery_astdb res_sorcery_config res_sorcery_memory res_sorcery_realtime,,)) $(eval $(call BuildAsterisk13Module,res-srtp,SRTP Support,Secure RTP connection,+libsrtp,,res_srtp,,)) $(eval $(call BuildAsterisk13Module,res-timing-pthread,pthread Timing Interface,,,,res_timing_pthread,,)) -- cgit From 58267f9bafdc7580a421b7e83aae3f6edf270404 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Fri, 26 Jun 2015 00:27:19 +0200 Subject: chan-sccp-b: fix package install Signed-off-by: Daniel Golle --- net/chan-sccp-b/Makefile | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/net/chan-sccp-b/Makefile b/net/chan-sccp-b/Makefile index b7d3d34..0dbfb52 100644 --- a/net/chan-sccp-b/Makefile +++ b/net/chan-sccp-b/Makefile @@ -98,14 +98,11 @@ define Package/Install/Default $(INSTALL_DIR) $(1)/etc/asterisk $(CP) ./files/sccp.conf $(1)/etc/asterisk/sccp.conf $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules - $(CP) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_sccp.so $(1)/usr/lib/asterisk/modules/ - if [ -f /usr/bin/sqlite3 ]; then - $(CP) ./files/extconfig.conf.sccp_sample $(1)/etc/asterisk/extconfig.conf.sccp_sample - $(CP) ./files/res_config_sqlite3.conf.sccp_sample $(1)/etc/asterisk/res_config_sqlite3.conf.sccp_sample - $(CP) ./files/sccp_sqlite3.sql $(1)/etc/asterisk/sccp_sqlite3.sql - $(CP) ./files/sccp.conf.realtime_sample $(1)/etc/asterisk/sccp.conf.realtime_sample - /usr/bin/sqlite3 /usr/lib/asterisk/realtime.sqlite3 < /etc/asterisk/sccp_sqlite3.sql - fi + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_sccp.so $(1)/usr/lib/asterisk/modules/ + $(INSTALL_DATA) ./files/extconfig.conf.sccp_sample $(1)/etc/asterisk/extconfig.conf.sccp_sample + $(INSTALL_DATA) ./files/res_config_sqlite3.conf.sccp_sample $(1)/etc/asterisk/res_config_sqlite3.conf.sccp_sample + $(INSTALL_DATA) ./files/sccp_sqlite3.sql $(1)/etc/asterisk/sccp_sqlite3.sql + $(INSTALL_DATA) ./files/sccp.conf.realtime_sample $(1)/etc/asterisk/sccp.conf.realtime_sample endef Package/asterisk18-chan-sccp-b/install = $(Package/Install/Default) -- cgit From a2677867f093fa437c2d4033782f7a7d9ce94d1c Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Fri, 26 Jun 2015 15:06:56 +0200 Subject: kamailio-4.x: build against libevent2 Signed-off-by: Daniel Golle --- net/kamailio-4.x/Makefile | 10 +++++----- net/kamailio-4.x/patches/120-libevent-libs.patch | 12 ++++++++++++ 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/net/kamailio-4.x/Makefile b/net/kamailio-4.x/Makefile index 1365fed..f02ec01 100644 --- a/net/kamailio-4.x/Makefile +++ b/net/kamailio-4.x/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=kamailio4 PKG_VERSION:=4.3.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=http://www.kamailio.org/pub/kamailio/$(PKG_VERSION)/src/ PKG_SOURCE:=kamailio-$(PKG_VERSION)$(PKG_VARIANT)_src.tar.gz @@ -125,7 +125,7 @@ $(eval $(call BuildKamailio4Module,benchmark,Config benchmark,,)) $(eval $(call BuildKamailio4Module,cfgutils,Config utilities,,)) $(eval $(call BuildKamailio4Module,cfg_db,Load core and module parameters from database,,+kamailio4-mod-db-sqlite)) $(eval $(call BuildKamailio4Module,cfg_rpc,Update core and module parameters at runtime via RPC interface,,)) -$(eval $(call BuildKamailio4Module,cnxcc,Limit call duration,,+kamailio4-mod-dialog +libhiredis +libevent)) +$(eval $(call BuildKamailio4Module,cnxcc,Limit call duration,,+kamailio4-mod-dialog +libhiredis +libevent2)) $(eval $(call BuildKamailio4Module,corex,Legacy functions,,)) $(eval $(call BuildKamailio4Module,ctl,BINRPC transport interface,,)) $(eval $(call BuildKamailio4Module,db_flatstore,Fast writing-only text database-backed,,)) @@ -152,9 +152,9 @@ $(eval $(call BuildKamailio4Module,htable,Hash Table,,)) $(eval $(call BuildKamailio4Module,imc,IM conferencing,,+kamailio4-mod-db-mysql +kamailio4-mod-tm)) $(eval $(call BuildKamailio4Module,ipops,IP and IPv6 operations,,)) $(eval $(call BuildKamailio4Module,jansson,Alternative access to JSON document attributes,,+jansson)) -# $(eval $(call BuildKamailio4Module,janssonrpc-c,Alternative JSONRPC server,,+kamailio4-mod-jansson +libevent2)) +$(eval $(call BuildKamailio4Module,janssonrpc-c,Alternative JSONRPC server,,+kamailio4-mod-jansson +libevent2)) $(eval $(call BuildKamailio4Module,json,Access to JSON document attributes,,+libjson-c)) -$(eval $(call BuildKamailio4Module,jsonrpc-s,JSONRPC server over HTTP,,+kamailio4-mod-json +libevent)) +$(eval $(call BuildKamailio4Module,jsonrpc-s,JSONRPC server over HTTP,,+kamailio4-mod-json +libevent2)) $(eval $(call BuildKamailio4Module,kex,Core extensions,,)) $(eval $(call BuildKamailio4Module,lcr,Least Cost Routing,,+kamailio4-mod-tm +libpcre)) $(eval $(call BuildKamailio4Module,ldap,LDAP connector,,+libopenldap)) @@ -242,7 +242,7 @@ PKG_MAKE_ARGS:= \ CC="$(TARGET_CC)" \ ARCH="$(ARCH)" \ DESTDIR=$(PKG_INSTALL_DIR) \ - EXTRA_LIBS="-L$(STAGING_DIR)/usr/lib/ -L$(STAGING_DIR)/usr/lib/libevent" \ + EXTRA_LIBS="-L$(STAGING_DIR)/usr/lib/" \ quiet=verbose define Build/Compile diff --git a/net/kamailio-4.x/patches/120-libevent-libs.patch b/net/kamailio-4.x/patches/120-libevent-libs.patch index f4d6569..918d27b 100644 --- a/net/kamailio-4.x/patches/120-libevent-libs.patch +++ b/net/kamailio-4.x/patches/120-libevent-libs.patch @@ -11,3 +11,15 @@ Index: kamailio4-4.3.0/modules/cnxcc/Makefile DEFS+=-DOPENSER_MOD_INTERFACE SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/kmi/kmi +Index: kamailio4-4.3.0/modules/janssonrpc-c/netstring.h +=================================================================== +--- kamailio4-4.3.0.orig/modules/janssonrpc-c/netstring.h ++++ kamailio4-4.3.0/modules/janssonrpc-c/netstring.h +@@ -24,6 +24,7 @@ + #define __NETSTRING_STREAM_H + + #include ++#include + #include + + typedef struct { -- cgit From 92f68f5c9cdfa7ef44015ff8adff9938538e9a68 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sun, 28 Jun 2015 23:16:31 +0200 Subject: yate: update source Signed-off-by: Daniel Golle --- net/yate/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/net/yate/Makefile b/net/yate/Makefile index dc0d1ee..5b50e21 100644 --- a/net/yate/Makefile +++ b/net/yate/Makefile @@ -9,15 +9,15 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/uclibc++.mk -RELEASEVER:=5.4.2 +RELEASEVER:=5.5.0 PKG_NAME:=yate PKG_VERSION:=$(RELEASEVER)-1 -PKG_RELEASE:=4 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://yate.null.ro/tarballs/yate5/ -PKG_MD5SUM:=50ffb5a9d3a7105a8776e56783d309ed +PKG_MD5SUM:=c433b3df08a5993e16fadaac279e39a0 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) PKG_LICENSE:=GPL-2.0 @@ -118,12 +118,12 @@ CONFIGURE_ARGS+= \ CONFIGURE_VARS+= \ LDFLAGS="$$$$LDFLAGS -nodefaultlibs" \ - LIBS="-lc -luClibc++ -lpthread -lresolv -ldl -lm -lc $(LIBGCC_S)" + LIBS="-lc -luClibc++ -lpthread -lresolv -ldl -lm -lc $(LIBGCC_S) $(LIBNSL)" define Package/$(PKG_NAME)/install $(INSTALL_DIR) $(1)/usr/lib - for yatelib in "" sig mgcp jabber script; do \ + for yatelib in "" asn sig mgcp jabber script; do \ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libyate$$$${yatelib}.so.$(RELEASEVER) $(1)/usr/lib ;\ $(LN) ./libyate$$$${yatelib}.so.$(RELEASEVER) $(1)/usr/lib/libyate$$$${yatelib}.so ;\ done -- cgit From 269200fecc531558474eeecb947e976e79bf269f Mon Sep 17 00:00:00 2001 From: Jiri Slachta Date: Wed, 1 Jul 2015 15:25:30 +0200 Subject: asterisk-13.x: modules restructuralization and addition Within this commit several modules were reworked and simplified. * Voicemail module has been split to res-adsi, res-smdi and voicemail module. * app_confbridge has been split to atomic bridge modules * res_calendar has been added Signed-off-by: Jiri Slachta --- net/asterisk-13.x/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/net/asterisk-13.x/Makefile b/net/asterisk-13.x/Makefile index 3bbbfd3..2c9fc3f 100644 --- a/net/asterisk-13.x/Makefile +++ b/net/asterisk-13.x/Makefile @@ -291,6 +291,9 @@ $(eval $(call BuildAsterisk13Module,app-confbridge,ConfBridge,Software bridge fo $(eval $(call BuildAsterisk13Module,app-directed_pickup,Directed call pickup,support for directed call pickup,,,app_directed_pickup,,)) $(eval $(call BuildAsterisk13Module,app-disa,Direct Inward System Access,Direct Inward System Access,,,app_disa,,)) $(eval $(call BuildAsterisk13Module,app-exec,Exec application,support for application execution,,,app_exec,,)) +$(eval $(call BuildAsterisk13Module,app-chanisavail,Channel availability check,support for checking if a channel is available,,,app_chanisavail,,)) +$(eval $(call BuildAsterisk13Module,app-chanspy,Channel listen in,support for listening in on any channel,,,app_chanspy,,)) +$(eval $(call BuildAsterisk13Module,app-confbridge,ConfBridge,Software bridge for multi-party audio conferencing,+asterisk13-bridge-builtin-features +asterisk13-bridge-multiplexed +asterisk13-bridge-simple +asterisk13-bridge-softmix,confbridge.conf,app_confbridge,,)) $(eval $(call BuildAsterisk13Module,app-minivm,Minimal voicemail system,a voicemail system in small building blocks working together based on the Comedian Mail voicemail,,extensions_minivm.conf minivm.conf,app_minivm,,)) $(eval $(call BuildAsterisk13Module,app-mixmonitor,Record a call and mix the audio,record a call and mix the audio during the recording,,,app_mixmonitor,,)) $(eval $(call BuildAsterisk13Module,app-originate,Originate a call,originating an outbound call and connecting it to a specified extension or application,,,app_originate,,)) @@ -309,7 +312,7 @@ $(eval $(call BuildAsterisk13Module,app-waituntil,Sleep,support sleeping until t $(eval $(call BuildAsterisk13Module,app-while,While loop,a while loop implementation,,,app_while,,)) $(eval $(call BuildAsterisk13Module,bridge-builtin-features,Bridging features,built in bridging features,,,bridge_builtin_features)) $(eval $(call BuildAsterisk13Module,bridge-builtin-interval-features,Built in bridging interval features,built in bridging interval features,,,bridge_builtin_interval_features)) -$(eval $(call BuildAsterisk13Module,bridge-holding,Bridging for storing channels in a bridge,bridging technology for storing channels in a bridge,,,bridge_holding)) +$(eval $(call BuildAsterisk13Module,bridge-holding,Bridging for storing channels in a bridge,Bridging technology for storing channels in a bridge for the purpose of holding, parking, queues, and other such states where a channel may need to be in a bridge but not actually communicating with anything.,,,bridge_holding)) $(eval $(call BuildAsterisk13Module,bridge-native-rtp,Native RTP bridging technology module,native RTP bridging technology module,,,bridge_native_rtp)) $(eval $(call BuildAsterisk13Module,bridge-simple,Simple two channel bridging module,simple two channel bridging module,,,bridge_simple)) $(eval $(call BuildAsterisk13Module,bridge-softmix,Multi-party software based channel mixing,multi-party software based channel mixing,,,bridge_softmix)) @@ -385,6 +388,7 @@ $(eval $(call BuildAsterisk13Module,res-realtime,Realtime,Realtime Interface,,,r $(eval $(call BuildAsterisk13Module,res-rtp-asterisk,RTP stack,,+libpjsip +libpjmedia +libpjnath +libpjsip-simple +libpjsip-ua +libpjsua +libpjsua2,rtp.conf,res_rtp_asterisk,,)) $(eval $(call BuildAsterisk13Module,res-rtp-multicast,RTP multicast engine,,,,res_rtp_multicast,,)) $(eval $(call BuildAsterisk13Module,res-smdi,Provide SMDI,Simple Message Desk Interface capability,,smdi.conf,res_smdi,,)) +$(eval $(call BuildAsterisk13Module,res-srtp,SRTP Support,Secure RTP connection,+libsrtp,,res_srtp,,)) $(eval $(call BuildAsterisk13Module,res-realtime,Realtime,Realtime Interface,,,res_realtime,,)) $(eval $(call BuildAsterisk13Module,res-sorcery,Sorcery data layer,,,,res_sorcery_astdb res_sorcery_config res_sorcery_memory res_sorcery_realtime,,)) $(eval $(call BuildAsterisk13Module,res-srtp,SRTP Support,Secure RTP connection,+libsrtp,,res_srtp,,)) -- cgit From 0e6f3cad55a30505649f2bdffc141ecef6a59be6 Mon Sep 17 00:00:00 2001 From: Jiri Slachta Date: Thu, 2 Jul 2015 09:03:05 +0200 Subject: asterisk-11.x: modules restructuralization and addition Within this commit following issues has been fixed: * app_directory has been added * voicemail module has been split to res_adsi, res_smdi and voicemail * res_calendar has been added Signed-off-by: Jiri Slachta --- net/asterisk-11.x/Makefile | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/net/asterisk-11.x/Makefile b/net/asterisk-11.x/Makefile index 66181cc..b6a91d9 100644 --- a/net/asterisk-11.x/Makefile +++ b/net/asterisk-11.x/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=asterisk11 PKG_VERSION:=11.18.0 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://downloads.asterisk.org/pub/telephony/asterisk/releases/ @@ -92,7 +92,7 @@ endef define Package/asterisk11 $(call Package/asterisk11/Default) - TITLE:=Complete open source PBX, v11.x + TITLE:=Complete open source PBX, v$(PKG_VERSION) MENU:=1 DEPENDS:=+libopenssl +libncurses +libpopt +libpthread +libsqlite3 +librt +libuuid +zlib @!TARGET_avr32 endef @@ -221,16 +221,6 @@ else --without-srtp endif -#ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk11-res-xmpp),) -# CONFIGURE_ARGS+= \ -# --with-iksemel="$(STAGING_DIR)/usr" -# SITE_VARS+= \ -# ac_cv_lib_iksemel_iks_start_sasl=yes -#else - CONFIGURE_ARGS+= \ - --without-iksemel -#endif - EXTRA_CFLAGS+= $(TARGET_CPPFLAGS) EXTRA_LDFLAGS+= $(TARGET_LDFLAGS) -Wl,-rpath-link,$(STAGING_DIR)/usr/lib CONFIGURE_ARGS+= \ @@ -243,6 +233,7 @@ CONFIGURE_ARGS+= \ --with-gsm=internal \ --without-gtk2 \ --with-ilbc=internal \ + --without-iksemel \ --without-isdnnet \ --without-libxml2 \ --without-misdn \ @@ -352,6 +343,7 @@ $(eval $(call BuildAsterisk11Module,app-alarmreceiver,Alarm receiver,Central Sta $(eval $(call BuildAsterisk11Module,app-authenticate,Authenticate commands,Execute arbitrary authenticate commands,,,,app_authenticate,)) $(eval $(call BuildAsterisk11Module,app-confbridge,ConfBridge,Software bridge for multi-party audio conferencing,,/etc/asterisk/confbridge.conf,confbridge.conf,app_confbridge bridge_builtin_features bridge_multiplexed bridge_simple bridge_softmix chan_bridge,)) $(eval $(call BuildAsterisk11Module,app-dahdiras,Execute an ISDN RAS,support for executing an ISDN RAS using DAHDI,+asterisk11-chan-dahdi,,,app_dahdiras,)) +$(eval $(call BuildAsterisk11Module,app-directory,Provide a directory of extensions,provides a directory of extensions,,,,app_directory,)) $(eval $(call BuildAsterisk11Module,app-directed_pickup,Directed call pickup,support for directed call pickup,,,,app_directed_pickup,)) $(eval $(call BuildAsterisk11Module,app-disa,Direct Inward System Access,Direct Inward System Access,,,,app_disa,)) $(eval $(call BuildAsterisk11Module,app-exec,Exec application,support for application execution,,,,app_exec,)) @@ -429,8 +421,10 @@ $(eval $(call BuildAsterisk11Module,pbx-lua,Lua,provides Lua resources for Aster $(eval $(call BuildAsterisk11Module,pbx-spool,Call Spool,outgoing call spool support,,,,pbx_spool,)) $(eval $(call BuildAsterisk11Module,pbx-realtime,Realtime Switch,realtime switch support,,,,pbx_realtime,)) $(eval $(call BuildAsterisk11Module,pgsql,PostgreSQL,PostgreSQL support,+libpq,/etc/asterisk/cel_pgsql.conf /etc/asterisk/cdr_pgsql.conf /etc/asterisk/res_pgsql.conf,cel_pgsql.conf cdr_pgsql.conf res_pgsql.conf,cel_pgsql cdr_pgsql res_config_pgsql,)) +$(eval $(call BuildAsterisk11Module,res-adsi,Provide ADSI,Analog Display Services Interface capability,,,,res_adsi,)) $(eval $(call BuildAsterisk11Module,res-ael-share,Shareable AEL code,support for shareable AEL code mainly between internal and external modules,,,,res_ael_share,)) $(eval $(call BuildAsterisk11Module,res-agi,Asterisk Gateway Interface,Support for the Asterisk Gateway Interface extension,,,,res_agi,)) +$(eval $(call BuildAsterisk11Module,res-calendar,Calendaring API,Calendaring support (ICal and Google Calendar),,/etc/asterisk/calendar.conf,calendar.conf,res_calendar,,)) $(eval $(call BuildAsterisk11Module,res-clioriginate,Calls via CLI,Originate calls via the CLI,,,,res_clioriginate,)) $(eval $(call BuildAsterisk11Module,res-fax-spandsp,Spandsp T.38 and G.711,Spandsp T.38 and G.711 FAX Resource,+asterisk11-res-fax +libspandsp +libtiff,,,res_fax_spandsp,)) $(eval $(call BuildAsterisk11Module,res-fax,FAX modules,Generic FAX resource for FAX technology resource modules,+asterisk11-res-timing-pthread,/etc/asterisk/res_fax.conf /etc/asterisk/udptl.conf,udptl.conf res_fax.conf,res_fax,)) @@ -443,6 +437,5 @@ $(eval $(call BuildAsterisk11Module,res-srtp,SRTP,Secure RTP,+libsrtp,,,res_srtp $(eval $(call BuildAsterisk11Module,res-timing-dahdi,DAHDI Timing Interface,,+asterisk11-chan-dahdi,,,res_timing_dahdi,)) $(eval $(call BuildAsterisk11Module,res-timing-pthread,pthread Timing Interface,,,,,res_timing_pthread,)) $(eval $(call BuildAsterisk11Module,res-timing-timerfd,Timerfd Timing Interface,,,,,res_timing_timerfd,)) -#$(eval $(call BuildAsterisk11Module,res-xmpp,XMPP,XMPP/Jabber support,+libiksemel,,,res_xmpp,)) $(eval $(call BuildAsterisk11Module,res-realtime,Realtime Interface,,,,,res_realtime,)) -$(eval $(call BuildAsterisk11Module,voicemail,Voicemail,voicemail related modules,,/etc/asterisk/voicemail.conf,voicemail.conf,*voicemail res_adsi res_smdi,vm-*)) +$(eval $(call BuildAsterisk11Module,voicemail,Voicemail,voicemail related modules,+asterisk11-res-adsi +asterisk11-res-smdi,/etc/asterisk/voicemail.conf,voicemail.conf,*voicemail,vm-*)) -- cgit From cc772d799a5f2cfdec4a95063d758880aec987a0 Mon Sep 17 00:00:00 2001 From: Jiri Slachta Date: Thu, 2 Jul 2015 11:35:13 +0200 Subject: re: update to 0.4.13 Signed-off-by: Jiri Slachta --- libs/re/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/re/Makefile b/libs/re/Makefile index b7abff2..befac2a 100644 --- a/libs/re/Makefile +++ b/libs/re/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=re -PKG_VERSION:=0.4.12 +PKG_VERSION:=0.4.13 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.creytiv.com/pub -PKG_MD5SUM:=f065b362bc97f8eed3d3cc44767983d6 +PKG_MD5SUM:=d5405878ca66c09d5e2e3b4e3d0c4c26 PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=docs/COPYING -- cgit From 1c7e5fca729ff69fd97cd37de663369d3ac2b9fa Mon Sep 17 00:00:00 2001 From: Jiri Slachta Date: Thu, 2 Jul 2015 12:09:57 +0200 Subject: asterisk-13.x: change module ordering Signed-off-by: Jiri Slachta --- net/asterisk-13.x/Makefile | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/net/asterisk-13.x/Makefile b/net/asterisk-13.x/Makefile index 2c9fc3f..baaf891 100644 --- a/net/asterisk-13.x/Makefile +++ b/net/asterisk-13.x/Makefile @@ -287,13 +287,10 @@ $(eval $(call BuildAsterisk13Module,app-alarmreceiver,Alarm receiver,Central Sta $(eval $(call BuildAsterisk13Module,app-authenticate,Authenticate commands,Execute arbitrary authenticate commands,,,app_authenticate,,)) $(eval $(call BuildAsterisk13Module,app-chanisavail,Channel availability check,support for checking if a channel is available,,,app_chanisavail,,)) $(eval $(call BuildAsterisk13Module,app-chanspy,Channel listen in,support for listening in on any channel,,,app_chanspy,,)) -$(eval $(call BuildAsterisk13Module,app-confbridge,ConfBridge,Software bridge for multi-party audio conferencing,+asterisk13-bridge-builtin-features +asterisk13-bridge-simple +asterisk13-bridge-softmix,confbridge.conf,app_confbridge,,)) +$(eval $(call BuildAsterisk13Module,app-confbridge,ConfBridge,Software bridge for multi-party audio conferencing,+asterisk13-bridge-builtin-features +asterisk13-bridge-multiplexed +asterisk13-bridge-simple +asterisk13-bridge-softmix,confbridge.conf,app_confbridge,,)) $(eval $(call BuildAsterisk13Module,app-directed_pickup,Directed call pickup,support for directed call pickup,,,app_directed_pickup,,)) $(eval $(call BuildAsterisk13Module,app-disa,Direct Inward System Access,Direct Inward System Access,,,app_disa,,)) $(eval $(call BuildAsterisk13Module,app-exec,Exec application,support for application execution,,,app_exec,,)) -$(eval $(call BuildAsterisk13Module,app-chanisavail,Channel availability check,support for checking if a channel is available,,,app_chanisavail,,)) -$(eval $(call BuildAsterisk13Module,app-chanspy,Channel listen in,support for listening in on any channel,,,app_chanspy,,)) -$(eval $(call BuildAsterisk13Module,app-confbridge,ConfBridge,Software bridge for multi-party audio conferencing,+asterisk13-bridge-builtin-features +asterisk13-bridge-multiplexed +asterisk13-bridge-simple +asterisk13-bridge-softmix,confbridge.conf,app_confbridge,,)) $(eval $(call BuildAsterisk13Module,app-minivm,Minimal voicemail system,a voicemail system in small building blocks working together based on the Comedian Mail voicemail,,extensions_minivm.conf minivm.conf,app_minivm,,)) $(eval $(call BuildAsterisk13Module,app-mixmonitor,Record a call and mix the audio,record a call and mix the audio during the recording,,,app_mixmonitor,,)) $(eval $(call BuildAsterisk13Module,app-originate,Originate a call,originating an outbound call and connecting it to a specified extension or application,,,app_originate,,)) @@ -362,10 +359,6 @@ $(eval $(call BuildAsterisk13Module,func-realtime,realtime,the realtime dialplan $(eval $(call BuildAsterisk13Module,func-shell,Shell,support for shell execution,,,func_shell,,)) $(eval $(call BuildAsterisk13Module,func-uri,URI encoding and decoding,Encodes and decodes URI-safe strings,,,func_uri,,)) $(eval $(call BuildAsterisk13Module,func-vmcount,vmcount dialplan,a vmcount dialplan function,,,func_vmcount,,)) -$(eval $(call BuildAsterisk13Module,chan-iax2,IAX2 channel,IAX support,+asterisk13-res-timing-timerfd,iax.conf iaxprov.conf,chan_iax2,,)) -$(eval $(call BuildAsterisk13Module,chan-sip,SIP channel,the channel chan_sip,+asterisk13-app-confbridge,sip.conf sip_notify.conf,chan_sip,,)) -$(eval $(call BuildAsterisk13Module,chan-skinny,Skinny channel,the channel chan_skinny,,skinny.conf,chan_skinny,,)) -$(eval $(call BuildAsterisk13Module,chan-unistim,Unistim channel,channel driver for the UNISTIM (Unified Networks IP Stimulus) protocol,,unistim.conf,chan_unistim,,)) $(eval $(call BuildAsterisk13Module,odbc,ODBC,ODBC support,+libpthread +libc +unixodbc,cdr_adaptive_odbc.conf cdr_odbc.conf cel_odbc.conf func_odbc.conf res_odbc.conf,cdr_adaptive_odbc cdr_odbc cel_odbc func_odbc res_config_odbc res_odbc,,)) $(eval $(call BuildAsterisk13Module,pbx-ael,Asterisk Extension Logic,support for symbolic Asterisk Extension Logic,,extensions.ael,pbx_ael,,)) $(eval $(call BuildAsterisk13Module,pbx-dundi,Dundi,provides Dundi Lookup service for Asterisk,,dundi.conf,pbx_dundi,,)) @@ -388,8 +381,6 @@ $(eval $(call BuildAsterisk13Module,res-realtime,Realtime,Realtime Interface,,,r $(eval $(call BuildAsterisk13Module,res-rtp-asterisk,RTP stack,,+libpjsip +libpjmedia +libpjnath +libpjsip-simple +libpjsip-ua +libpjsua +libpjsua2,rtp.conf,res_rtp_asterisk,,)) $(eval $(call BuildAsterisk13Module,res-rtp-multicast,RTP multicast engine,,,,res_rtp_multicast,,)) $(eval $(call BuildAsterisk13Module,res-smdi,Provide SMDI,Simple Message Desk Interface capability,,smdi.conf,res_smdi,,)) -$(eval $(call BuildAsterisk13Module,res-srtp,SRTP Support,Secure RTP connection,+libsrtp,,res_srtp,,)) -$(eval $(call BuildAsterisk13Module,res-realtime,Realtime,Realtime Interface,,,res_realtime,,)) $(eval $(call BuildAsterisk13Module,res-sorcery,Sorcery data layer,,,,res_sorcery_astdb res_sorcery_config res_sorcery_memory res_sorcery_realtime,,)) $(eval $(call BuildAsterisk13Module,res-srtp,SRTP Support,Secure RTP connection,+libsrtp,,res_srtp,,)) $(eval $(call BuildAsterisk13Module,res-timing-pthread,pthread Timing Interface,,,,res_timing_pthread,,)) -- cgit From b47b40fb0518a4666291646b160d809beff11914 Mon Sep 17 00:00:00 2001 From: Jiri Slachta Date: Wed, 22 Jul 2015 15:16:46 +0200 Subject: baresip: closing #56, added modules speex-aec, speex-pp, httpd. Signed-off-by: Jiri Slachta --- net/baresip/Makefile | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/net/baresip/Makefile b/net/baresip/Makefile index a78089d..d17aec6 100644 --- a/net/baresip/Makefile +++ b/net/baresip/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=baresip PKG_VERSION:=0.4.12 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.creytiv.com/pub/ @@ -28,8 +28,11 @@ baresip-mods:= \ evdev \ g711 \ g722 \ + g726 \ oss \ speex \ + speex-aec \ + speex-pp \ stdio \ uuid \ v4l \ @@ -61,8 +64,11 @@ baresip-mod-cons := USE_CONS baresip-mod-evdev := USE_EVDEV baresip-mod-g711 := USE_G711 baresip-mod-g722 := USE_G722 +baresip-mod-g726 := USE_G726 baresip-mod-oss := USE_OSS baresip-mod-speex := USE_SPEEX +baresip-mod-speex-aec := USE_SPEEX_AEC +baresip-mod-speex-pp := USE_SPEEX_PP baresip-mod-stdio := USE_STDIO baresip-mod-uuid := USE_UUID baresip-mod-v4l := USE_V4L @@ -142,8 +148,12 @@ $(eval $(call BuildPlugin,cons,console UI,cons,)) $(eval $(call BuildPlugin,evdev,input event device UI,evdev,)) $(eval $(call BuildPlugin,g711,G.711 audio codec,g711,)) $(eval $(call BuildPlugin,g722,G.722 audio codec,g722,+PACKAGE_baresip-mod-g722:libspandsp)) +$(eval $(call BuildPlugin,g726,G.726 audio codec,g726,+PACKAGE_baresip-mod-g726:libspandsp)) +$(eval $(call BuildPlugin,httpd,Webserver UI module,httpd,)) $(eval $(call BuildPlugin,oss,OSS audio driver,oss,)) $(eval $(call BuildPlugin,speex,Speex audio codec,speex,+PACKAGE_baresip-mod-speex:libspeex)) +$(eval $(call BuildPlugin,speex-aec,Speex Acoustic Echo Cancellation,speex_aec,+PACKAGE_baresip-mod-speex-aec:libspeex)) +$(eval $(call BuildPlugin,speex-pp,Speex Pre-processor,speex_pp,+PACKAGE_baresip-mod-speex-pp:libspeex)) $(eval $(call BuildPlugin,stdio,standard I/O UI,stdio,)) $(eval $(call BuildPlugin,uuid,UUID,uuid,+libuuid)) $(eval $(call BuildPlugin,v4l,Video4Linux video source,v4l,+PACKAGE_baresip-mod-v4l:libv4l)) -- cgit From 1c1d2f02a5c5ddf143a60686166e0efb15ba37ee Mon Sep 17 00:00:00 2001 From: Jiri Slachta Date: Thu, 30 Jul 2015 13:17:26 +0200 Subject: asterisk-13.x: fix syntax for bridge modules Signed-off-by: Jiri Slachta --- net/asterisk-13.x/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/asterisk-13.x/Makefile b/net/asterisk-13.x/Makefile index baaf891..a01ba95 100644 --- a/net/asterisk-13.x/Makefile +++ b/net/asterisk-13.x/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=asterisk13 PKG_VERSION:=13.4.0 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://downloads.asterisk.org/pub/telephony/asterisk/releases/ @@ -287,7 +287,7 @@ $(eval $(call BuildAsterisk13Module,app-alarmreceiver,Alarm receiver,Central Sta $(eval $(call BuildAsterisk13Module,app-authenticate,Authenticate commands,Execute arbitrary authenticate commands,,,app_authenticate,,)) $(eval $(call BuildAsterisk13Module,app-chanisavail,Channel availability check,support for checking if a channel is available,,,app_chanisavail,,)) $(eval $(call BuildAsterisk13Module,app-chanspy,Channel listen in,support for listening in on any channel,,,app_chanspy,,)) -$(eval $(call BuildAsterisk13Module,app-confbridge,ConfBridge,Software bridge for multi-party audio conferencing,+asterisk13-bridge-builtin-features +asterisk13-bridge-multiplexed +asterisk13-bridge-simple +asterisk13-bridge-softmix,confbridge.conf,app_confbridge,,)) +$(eval $(call BuildAsterisk13Module,app-confbridge,ConfBridge,Software bridge for multi-party audio conferencing,+asterisk13-bridge-builtin-features +asterisk13-bridge-simple +asterisk13-bridge-softmix,confbridge.conf,app_confbridge,,)) $(eval $(call BuildAsterisk13Module,app-directed_pickup,Directed call pickup,support for directed call pickup,,,app_directed_pickup,,)) $(eval $(call BuildAsterisk13Module,app-disa,Direct Inward System Access,Direct Inward System Access,,,app_disa,,)) $(eval $(call BuildAsterisk13Module,app-exec,Exec application,support for application execution,,,app_exec,,)) @@ -309,7 +309,7 @@ $(eval $(call BuildAsterisk13Module,app-waituntil,Sleep,support sleeping until t $(eval $(call BuildAsterisk13Module,app-while,While loop,a while loop implementation,,,app_while,,)) $(eval $(call BuildAsterisk13Module,bridge-builtin-features,Bridging features,built in bridging features,,,bridge_builtin_features)) $(eval $(call BuildAsterisk13Module,bridge-builtin-interval-features,Built in bridging interval features,built in bridging interval features,,,bridge_builtin_interval_features)) -$(eval $(call BuildAsterisk13Module,bridge-holding,Bridging for storing channels in a bridge,Bridging technology for storing channels in a bridge for the purpose of holding, parking, queues, and other such states where a channel may need to be in a bridge but not actually communicating with anything.,,,bridge_holding)) +$(eval $(call BuildAsterisk13Module,bridge-holding,Bridging for storing channels in a bridge,bridging technology for storing channels in a bridge,,,bridge_holding)) $(eval $(call BuildAsterisk13Module,bridge-native-rtp,Native RTP bridging technology module,native RTP bridging technology module,,,bridge_native_rtp)) $(eval $(call BuildAsterisk13Module,bridge-simple,Simple two channel bridging module,simple two channel bridging module,,,bridge_simple)) $(eval $(call BuildAsterisk13Module,bridge-softmix,Multi-party software based channel mixing,multi-party software based channel mixing,,,bridge_softmix)) -- cgit From 12e67fca182aae88f11851bfe592b9cefd1a9714 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sat, 8 Aug 2015 09:33:59 +0200 Subject: asterisk-11.x: Bump to 11.19.0 Compile-tested on BB 14.07. Signed-off-by: Sebastian Kemper --- net/asterisk-11.x/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/asterisk-11.x/Makefile b/net/asterisk-11.x/Makefile index b6a91d9..b506ad1 100644 --- a/net/asterisk-11.x/Makefile +++ b/net/asterisk-11.x/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=asterisk11 -PKG_VERSION:=11.18.0 -PKG_RELEASE:=3 +PKG_VERSION:=11.19.0 +PKG_RELEASE:=1 PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://downloads.asterisk.org/pub/telephony/asterisk/releases/ -PKG_MD5SUM:=3ddb42b54db200faccd68906df210a40 +PKG_MD5SUM:=f10259509aeda1e9f47dd57e5cc23680 PKG_BUILD_DIR=$(BUILD_DIR)/asterisk-$(PKG_VERSION) PKG_BUILD_DEPENDS:=libxml2/host -- cgit From f0e9d471b0f4966091fd1f344f9485b38b0c505e Mon Sep 17 00:00:00 2001 From: Jiri Slachta Date: Wed, 12 Aug 2015 13:56:44 +0200 Subject: [PATCH] baresip: upgrade to 0.4.14 - upgrade baresip to 0.4.14 - uuid module is now part of the core-baresip - add building of dtmfio module Signed-off-By: Alfred E. Heggestad Acked-by: Jiri Slachta Tested-by: Jiri Slachta --- net/baresip/Makefile | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/net/baresip/Makefile b/net/baresip/Makefile index d17aec6..ed862f2 100644 --- a/net/baresip/Makefile +++ b/net/baresip/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=baresip -PKG_VERSION:=0.4.12 -PKG_RELEASE:=3 +PKG_VERSION:=0.4.14 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.creytiv.com/pub/ -PKG_MD5SUM:=93c0ea33ec0e96b89b1c3e0f78b72c5b +PKG_MD5SUM:=06e0aea9ba3dbbbe834285a8c7e7df83 PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=docs/COPYING @@ -34,7 +34,6 @@ baresip-mods:= \ speex-aec \ speex-pp \ stdio \ - uuid \ v4l \ v4l2 \ @@ -70,12 +69,12 @@ baresip-mod-speex := USE_SPEEX baresip-mod-speex-aec := USE_SPEEX_AEC baresip-mod-speex-pp := USE_SPEEX_PP baresip-mod-stdio := USE_STDIO -baresip-mod-uuid := USE_UUID baresip-mod-v4l := USE_V4L baresip-mod-v4l2 := USE_V4L2 BARESIP_MOD_OPTIONS:= \ MOD_AUTODETECT= \ + EXTRA_MODULES="dtmfio" \ $(foreach m,$(baresip-mods),$(baresip-mod-$(m))=$(if $(CONFIG_PACKAGE_baresip-mod-$(m)),1)) TARGET_CFLAGS += $(FPIC) @@ -155,6 +154,5 @@ $(eval $(call BuildPlugin,speex,Speex audio codec,speex,+PACKAGE_baresip-mod-spe $(eval $(call BuildPlugin,speex-aec,Speex Acoustic Echo Cancellation,speex_aec,+PACKAGE_baresip-mod-speex-aec:libspeex)) $(eval $(call BuildPlugin,speex-pp,Speex Pre-processor,speex_pp,+PACKAGE_baresip-mod-speex-pp:libspeex)) $(eval $(call BuildPlugin,stdio,standard I/O UI,stdio,)) -$(eval $(call BuildPlugin,uuid,UUID,uuid,+libuuid)) $(eval $(call BuildPlugin,v4l,Video4Linux video source,v4l,+PACKAGE_baresip-mod-v4l:libv4l)) $(eval $(call BuildPlugin,v4l2,Video4Linux2 video source,v4l2,+PACKAGE_baresip-mod-v4l2:libv4l)) -- cgit From bfb24763f1923eacdb6b0bb14f931f486f9339af Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Wed, 19 Aug 2015 12:23:22 +0200 Subject: dahdi-linux: update to 2.10.2 Signed-off-by: Daniel Golle --- libs/dahdi-linux/Makefile | 4 +- .../001-include-slab-h-in-oct612x-user-c.patch | 6 +- .../002-backport-smp_mb__after_atomic.patch | 89 ---------------------- libs/dahdi-linux/patches/003-fix-oslec-build.patch | 6 +- ...rt-struct-file_f_dentry-macro-was-removed.patch | 35 --------- .../005-backport-fix-void-value-not-ignored.patch | 45 ----------- .../006-backport-strnicmp-strncasecmp.patch | 56 -------------- .../patches/050-re-enable-ztdummy.patch | 6 +- .../patches/100-add-support-for-hfc-s-pci.patch | 32 +++----- 9 files changed, 17 insertions(+), 262 deletions(-) delete mode 100644 libs/dahdi-linux/patches/002-backport-smp_mb__after_atomic.patch delete mode 100644 libs/dahdi-linux/patches/004-backport-struct-file_f_dentry-macro-was-removed.patch delete mode 100644 libs/dahdi-linux/patches/005-backport-fix-void-value-not-ignored.patch delete mode 100644 libs/dahdi-linux/patches/006-backport-strnicmp-strncasecmp.patch diff --git a/libs/dahdi-linux/Makefile b/libs/dahdi-linux/Makefile index 7425eb9..7ae57bd 100644 --- a/libs/dahdi-linux/Makefile +++ b/libs/dahdi-linux/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=dahdi-linux -PKG_VERSION:=2.10.0.1 +PKG_VERSION:=2.10.2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/ -PKG_MD5SUM:=a23e91cc474f241616a5a038ae2b1e72 +PKG_MD5SUM:=0281de245f4fa056f765ae2a6e1f1a4b PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=LICENSE diff --git a/libs/dahdi-linux/patches/001-include-slab-h-in-oct612x-user-c.patch b/libs/dahdi-linux/patches/001-include-slab-h-in-oct612x-user-c.patch index ad79a00..4099cc0 100644 --- a/libs/dahdi-linux/patches/001-include-slab-h-in-oct612x-user-c.patch +++ b/libs/dahdi-linux/patches/001-include-slab-h-in-oct612x-user-c.patch @@ -1,7 +1,5 @@ -Index: dahdi-linux-2.10.0.1/drivers/dahdi/oct612x/oct612x-user.c -=================================================================== ---- dahdi-linux-2.10.0.1.orig/drivers/dahdi/oct612x/oct612x-user.c -+++ dahdi-linux-2.10.0.1/drivers/dahdi/oct612x/oct612x-user.c +--- a/drivers/dahdi/oct612x/oct612x-user.c ++++ b/drivers/dahdi/oct612x/oct612x-user.c @@ -22,6 +22,7 @@ #include diff --git a/libs/dahdi-linux/patches/002-backport-smp_mb__after_atomic.patch b/libs/dahdi-linux/patches/002-backport-smp_mb__after_atomic.patch deleted file mode 100644 index b446f33..0000000 --- a/libs/dahdi-linux/patches/002-backport-smp_mb__after_atomic.patch +++ /dev/null @@ -1,89 +0,0 @@ -Index: dahdi-linux-2.10.0.1/drivers/dahdi/wcaxx-base.c -=================================================================== ---- dahdi-linux-2.10.0.1.orig/drivers/dahdi/wcaxx-base.c -+++ dahdi-linux-2.10.0.1/drivers/dahdi/wcaxx-base.c -@@ -3823,7 +3823,11 @@ static void wcaxx_back_out_gracefully(st - unsigned long flags; - - clear_bit(INITIALIZED, &wc->bit_flags); -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 15, 0)) - smp_mb__after_clear_bit(); -+#else -+ smp_mb__after_atomic(); -+#endif - - /* Make sure we're not on the card list anymore. */ - mutex_lock(&card_list_lock); -Index: dahdi-linux-2.10.0.1/drivers/dahdi/wcte12xp/base.c -=================================================================== ---- dahdi-linux-2.10.0.1.orig/drivers/dahdi/wcte12xp/base.c -+++ dahdi-linux-2.10.0.1/drivers/dahdi/wcte12xp/base.c -@@ -2110,7 +2110,11 @@ static int t1xxp_set_linemode(struct dah - * them. */ - clear_bit(INITIALIZED, &wc->bit_flags); - synchronize_irq(wc->vb.pdev->irq); -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 15, 0)) - smp_mb__after_clear_bit(); -+#else -+ smp_mb__after_atomic(); -+#endif - del_timer_sync(&wc->timer); - flush_workqueue(wc->wq); - -@@ -3076,7 +3080,11 @@ static void __devexit te12xp_remove_one( - remove_sysfs_files(wc); - - clear_bit(INITIALIZED, &wc->bit_flags); -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 15, 0)) - smp_mb__after_clear_bit(); -+#else -+ smp_mb__after_atomic(); -+#endif - - del_timer_sync(&wc->timer); - flush_workqueue(wc->wq); -Index: dahdi-linux-2.10.0.1/drivers/dahdi/wcte13xp-base.c -=================================================================== ---- dahdi-linux-2.10.0.1.orig/drivers/dahdi/wcte13xp-base.c -+++ dahdi-linux-2.10.0.1/drivers/dahdi/wcte13xp-base.c -@@ -1849,7 +1849,12 @@ static int t13x_set_linemode(struct dahd - clear_bit(INITIALIZED, &wc->bit_flags); - disable_irq(wc->xb.pdev->irq); - -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 15, 0)) - smp_mb__after_clear_bit(); -+#else -+ smp_mb__after_atomic(); -+#endif -+ - del_timer_sync(&wc->timer); - flush_workqueue(wc->wq); - -@@ -2725,7 +2730,11 @@ static void __devexit te13xp_remove_one( - return; - - clear_bit(INITIALIZED, &wc->bit_flags); -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 15, 0)) - smp_mb__after_clear_bit(); -+#else -+ smp_mb__after_atomic(); -+#endif - - /* Quiesce DMA engine interrupts */ - wcxb_stop(&wc->xb); -Index: dahdi-linux-2.10.0.1/drivers/dahdi/wcte43x-base.c -=================================================================== ---- dahdi-linux-2.10.0.1.orig/drivers/dahdi/wcte43x-base.c -+++ dahdi-linux-2.10.0.1/drivers/dahdi/wcte43x-base.c -@@ -3581,7 +3581,11 @@ static void __devexit t43x_remove_one(st - return; - - wc->not_ready = 1; -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 15, 0)) - smp_mb__after_clear_bit(); -+#else -+ smp_mb__after_atomic(); -+#endif - - /* Stop everything */ - wcxb_stop(&wc->xb); diff --git a/libs/dahdi-linux/patches/003-fix-oslec-build.patch b/libs/dahdi-linux/patches/003-fix-oslec-build.patch index fbc5d50..e052235 100644 --- a/libs/dahdi-linux/patches/003-fix-oslec-build.patch +++ b/libs/dahdi-linux/patches/003-fix-oslec-build.patch @@ -1,7 +1,5 @@ -Index: dahdi-linux-2.10.0.1/drivers/dahdi/Kbuild -=================================================================== ---- dahdi-linux-2.10.0.1.orig/drivers/dahdi/Kbuild -+++ dahdi-linux-2.10.0.1/drivers/dahdi/Kbuild +--- a/drivers/dahdi/Kbuild ++++ b/drivers/dahdi/Kbuild @@ -61,9 +61,8 @@ obj-m += $(DAHDI_MODULES_EXTRA) # If you want to build OSLEC, include the code in the standard location: # drivers/staging/echo . The DAHDI OSLEC echo canceller will be built as diff --git a/libs/dahdi-linux/patches/004-backport-struct-file_f_dentry-macro-was-removed.patch b/libs/dahdi-linux/patches/004-backport-struct-file_f_dentry-macro-was-removed.patch deleted file mode 100644 index 7a52418..0000000 --- a/libs/dahdi-linux/patches/004-backport-struct-file_f_dentry-macro-was-removed.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 4d86a8f3f690ee9bb9429e17cc03856c6c2dc760 Mon Sep 17 00:00:00 2001 -From: Shaun Ruffell -Date: Mon, 22 Dec 2014 11:21:28 -0600 -Subject: [PATCH] dahdi: struct file.f_dentry macro was removed in kernel 3.19 - -This is necessary to build against kernel version 3.19 since commit -(78d28e651f97866d608d9b41 "kill f_dentry macro") [1] - -[1] https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=78d28e651 - -Signed-off-by: Shaun Ruffell -Signed-off-by: Russ Meyerriecks ---- - drivers/dahdi/dahdi-base.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c -index 0892734..f2caad0 100644 ---- a/drivers/dahdi/dahdi-base.c -+++ b/drivers/dahdi/dahdi-base.c -@@ -98,7 +98,11 @@ - #define chan_to_netdev(h) ((h)->hdlcnetdev->netdev) - - /* macro-oni for determining a unit (channel) number */ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20) - #define UNIT(file) MINOR(file->f_dentry->d_inode->i_rdev) -+#else -+#define UNIT(file) MINOR(file->f_path.dentry->d_inode->i_rdev) -+#endif - - EXPORT_SYMBOL(dahdi_transcode_fops); - EXPORT_SYMBOL(dahdi_init_tone_state); --- -2.3.4 - diff --git a/libs/dahdi-linux/patches/005-backport-fix-void-value-not-ignored.patch b/libs/dahdi-linux/patches/005-backport-fix-void-value-not-ignored.patch deleted file mode 100644 index c4c317a..0000000 --- a/libs/dahdi-linux/patches/005-backport-fix-void-value-not-ignored.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 1cc0ad510acd404e63923ed3062b9302d53580da Mon Sep 17 00:00:00 2001 -From: Shaun Ruffell -Date: Mon, 2 Mar 2015 09:00:13 -0600 -Subject: [PATCH] dahdi: Fix "void value not ignored..." error when compiling - against kernel 4.0. - -With commit (d1f1052c52 "device: Change dev_ logging functions to return -void") [1] in kernel version 4.0, DAHDI would fail to compile with the following -error: - - .../drivers/dahdi/dahdi-base.c:7150:2: error: void value not ignored as it ought to be - dahdi_dev_dbg(ASSIGN, span_device(span), - ^ - -Now ignore the dev_printk return value. - -[1] https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=d1f1052c5204524 - -Signed-off-by: Shaun Ruffell -Acked-by: Tzafrir Cohen ---- - include/dahdi/kernel.h | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h -index 365801d..54c415e 100644 ---- a/include/dahdi/kernel.h -+++ b/include/dahdi/kernel.h -@@ -1665,9 +1665,11 @@ struct mutex { - chan_printk(DEBUG, "-" #bits, chan, \ - "%s: " fmt, __func__, ## __VA_ARGS__))) - #define dahdi_dev_dbg(bits, dev, fmt, ...) \ -- ((void)((debug & (DAHDI_DBG_ ## bits)) && \ -+ do { if (debug & (DAHDI_DBG_ ## bits)) { \ - dev_printk(KERN_DEBUG, dev, \ -- "DBG-%s(%s): " fmt, #bits, __func__, ## __VA_ARGS__))) -+ "DBG-%s(%s): " fmt, #bits, __func__, ## __VA_ARGS__); \ -+ } } while (0) -+ - #endif /* DAHDI_PRINK_MACROS_USE_debug */ - - #endif /* _DAHDI_KERNEL_H */ --- -2.3.4 - diff --git a/libs/dahdi-linux/patches/006-backport-strnicmp-strncasecmp.patch b/libs/dahdi-linux/patches/006-backport-strnicmp-strncasecmp.patch deleted file mode 100644 index 56acebc..0000000 --- a/libs/dahdi-linux/patches/006-backport-strnicmp-strncasecmp.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 1559db9d1ae03780788788c07334ca54cdd1253a Mon Sep 17 00:00:00 2001 -From: Shaun Ruffell -Date: Mon, 2 Mar 2015 09:00:14 -0600 -Subject: [PATCH] dahdi: strnicmp() -> strncasecmp() - -With commit (af3cd13501 "lib/string.c: remove strnicmp()") [1] dahdi can no -longer call strnicmp directly. strncasecmp was added into lib/string.c in kernel -version 2.6.22 so we'll map calls to strncasecmp to strnicmp for any kernel -before that. - -This is necessary to compile against kernels >= 4.0. - -[1] https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=af3cd13501 - -Signed-off-by: Shaun Ruffell -Acked-by: Tzafrir Cohen ---- - drivers/dahdi/xpp/card_pri.c | 6 +++--- - include/dahdi/kernel.h | 2 ++ - 2 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/drivers/dahdi/xpp/card_pri.c b/drivers/dahdi/xpp/card_pri.c -index 29b457b..edc8bd2 100644 ---- a/drivers/dahdi/xpp/card_pri.c -+++ b/drivers/dahdi/xpp/card_pri.c -@@ -2399,11 +2399,11 @@ static DEVICE_ATTR_WRITER(pri_protocol_store, dev, buf, count) - buf, i); - return -EINVAL; - } -- if (strnicmp(buf, "E1", 2) == 0) -+ if (strncasecmp(buf, "E1", 2) == 0) - new_protocol = PRI_PROTO_E1; -- else if (strnicmp(buf, "T1", 2) == 0) -+ else if (strncasecmp(buf, "T1", 2) == 0) - new_protocol = PRI_PROTO_T1; -- else if (strnicmp(buf, "J1", 2) == 0) -+ else if (strncasecmp(buf, "J1", 2) == 0) - new_protocol = PRI_PROTO_J1; - else { - XPD_NOTICE(xpd, -diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h -index 54c415e..90d48a3 100644 ---- a/include/dahdi/kernel.h -+++ b/include/dahdi/kernel.h -@@ -1502,6 +1502,8 @@ void dahdi_pci_disable_link_state(struct pci_dev *pdev, int state); - #define list_first_entry(ptr, type, member) \ - list_entry((ptr)->next, type, member) - -+#define strncasecmp strnicmp -+ - #ifndef __packed - #define __packed __attribute__((packed)) - #endif --- -2.3.4 - diff --git a/libs/dahdi-linux/patches/050-re-enable-ztdummy.patch b/libs/dahdi-linux/patches/050-re-enable-ztdummy.patch index 581bea7..5db2dfe 100644 --- a/libs/dahdi-linux/patches/050-re-enable-ztdummy.patch +++ b/libs/dahdi-linux/patches/050-re-enable-ztdummy.patch @@ -1,7 +1,5 @@ -Index: dahdi-linux-2.10.0.1/drivers/dahdi/Kbuild -=================================================================== ---- dahdi-linux-2.10.0.1.orig/drivers/dahdi/Kbuild -+++ dahdi-linux-2.10.0.1/drivers/dahdi/Kbuild +--- a/drivers/dahdi/Kbuild ++++ b/drivers/dahdi/Kbuild @@ -1,5 +1,5 @@ obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI) += dahdi.o -#obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_DUMMY) += dahdi_dummy.o diff --git a/libs/dahdi-linux/patches/100-add-support-for-hfc-s-pci.patch b/libs/dahdi-linux/patches/100-add-support-for-hfc-s-pci.patch index cc73be5..b5535dd 100644 --- a/libs/dahdi-linux/patches/100-add-support-for-hfc-s-pci.patch +++ b/libs/dahdi-linux/patches/100-add-support-for-hfc-s-pci.patch @@ -1,7 +1,5 @@ -Index: dahdi-linux-2.10.0.1/drivers/dahdi/Kbuild -=================================================================== ---- dahdi-linux-2.10.0.1.orig/drivers/dahdi/Kbuild -+++ dahdi-linux-2.10.0.1/drivers/dahdi/Kbuild +--- a/drivers/dahdi/Kbuild ++++ b/drivers/dahdi/Kbuild @@ -13,6 +13,7 @@ obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCT obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCTDM24XXP) += wctdm24xxp/ obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCTE12XP) += wcte12xp/ @@ -10,10 +8,8 @@ Index: dahdi-linux-2.10.0.1/drivers/dahdi/Kbuild wcte13xp-objs := wcte13xp-base.o wcxb_spi.o wcxb.o wcxb_flash.o CFLAGS_wcte13xp-base.o += -I$(src)/oct612x -I$(src)/oct612x/include -I$(src)/oct612x/octdeviceapi -I$(src)/oct612x/octdeviceapi/oct6100api -Index: dahdi-linux-2.10.0.1/drivers/dahdi/Kconfig -=================================================================== ---- dahdi-linux-2.10.0.1.orig/drivers/dahdi/Kconfig -+++ dahdi-linux-2.10.0.1/drivers/dahdi/Kconfig +--- a/drivers/dahdi/Kconfig ++++ b/drivers/dahdi/Kconfig @@ -291,4 +291,14 @@ config DAHDI_WCTE11XP If unsure, say Y. @@ -29,10 +25,8 @@ Index: dahdi-linux-2.10.0.1/drivers/dahdi/Kconfig + If unsure, say Y. + source "drivers/dahdi/xpp/Kconfig" -Index: dahdi-linux-2.10.0.1/drivers/dahdi/hfcs/base.c -=================================================================== --- /dev/null -+++ dahdi-linux-2.10.0.1/drivers/dahdi/hfcs/base.c ++++ b/drivers/dahdi/hfcs/base.c @@ -0,0 +1,1742 @@ +/* + * dahdi_hfcs.c - Dahdi driver for HFC-S PCI A based ISDN BRI cards @@ -1776,10 +1770,8 @@ Index: dahdi-linux-2.10.0.1/drivers/dahdi/hfcs/base.c +#ifdef DEBUG +MODULE_PARM_DESC(debug_level, "Debug verbosity level"); +#endif -Index: dahdi-linux-2.10.0.1/drivers/dahdi/hfcs/dahdi_hfcs.h -=================================================================== --- /dev/null -+++ dahdi-linux-2.10.0.1/drivers/dahdi/hfcs/dahdi_hfcs.h ++++ b/drivers/dahdi/hfcs/dahdi_hfcs.h @@ -0,0 +1,419 @@ +/* + * dahdi_hfcs.h - Dahdi driver for HFC-S PCI A based ISDN BRI cards @@ -2200,10 +2192,8 @@ Index: dahdi-linux-2.10.0.1/drivers/dahdi/hfcs/dahdi_hfcs.h +} + +#endif -Index: dahdi-linux-2.10.0.1/drivers/dahdi/hfcs/fifo.c -=================================================================== --- /dev/null -+++ dahdi-linux-2.10.0.1/drivers/dahdi/hfcs/fifo.c ++++ b/drivers/dahdi/hfcs/fifo.c @@ -0,0 +1,380 @@ +/* + * fifo.c - HFC FIFO management routines @@ -2585,10 +2575,8 @@ Index: dahdi-linux-2.10.0.1/drivers/dahdi/hfcs/fifo.c + } +} + -Index: dahdi-linux-2.10.0.1/drivers/dahdi/hfcs/fifo.h -=================================================================== --- /dev/null -+++ dahdi-linux-2.10.0.1/drivers/dahdi/hfcs/fifo.h ++++ b/drivers/dahdi/hfcs/fifo.h @@ -0,0 +1,139 @@ +/* + * fifo.h - Dahdi driver for HFC-S PCI A based ISDN BRI cards @@ -2729,10 +2717,8 @@ Index: dahdi-linux-2.10.0.1/drivers/dahdi/hfcs/fifo.h +void hfc_clear_fifo_tx(struct hfc_chan_simplex *chan); + +#endif -Index: dahdi-linux-2.10.0.1/drivers/dahdi/hfcs/Kbuild -=================================================================== --- /dev/null -+++ dahdi-linux-2.10.0.1/drivers/dahdi/hfcs/Kbuild ++++ b/drivers/dahdi/hfcs/Kbuild @@ -0,0 +1,10 @@ +obj-m += dahdi_hfcs.o + -- cgit From d86ac9ab894b60f69e7ebbdf8f8090e2881fa261 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Wed, 19 Aug 2015 12:33:11 +0200 Subject: dahdi-tools: update to 2.10.2 Signed-off-by: Daniel Golle --- libs/dahdi-tools/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/dahdi-tools/Makefile b/libs/dahdi-tools/Makefile index ed9bcde..7dca319 100644 --- a/libs/dahdi-tools/Makefile +++ b/libs/dahdi-tools/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dahdi-tools -PKG_VERSION:=2.10.0.1 +PKG_VERSION:=2.10.2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://downloads.asterisk.org/pub/telephony/dahdi-tools/releases/ -PKG_MD5SUM:=224c5b86195249d5ce462ca316332087 +PKG_MD5SUM:=6928cdf6f7710299ecbcacbac20d5c92 PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=LICENSE -- cgit From db4edca8991e9f8369a6db222078bda272f3b04c Mon Sep 17 00:00:00 2001 From: Mazi Lo Date: Sat, 29 Aug 2015 12:23:52 -0400 Subject: [FreeSWITCH]: Update to v1.5.final 1. Added an sqlite2 option for configure in apr-util 2. Moved bootstrap to Prepare stage. 3. Restructured patches directory to include CONFIG_LIBC 4. Fixed some modules dependency issues. 5. Reinstated mod_enum as not BROKEN. 6. Renamed mod_vp8 to mod_vpx according to FS changes. 7. Added some new modules and some are flagged as BROKEN. i.e. mod_cv, mod_hiredis (BROKEN), mod_kazoo, mod_smpp (BROKEN) 8. Flagged some modules as BROKEN due to insufficient libraries. i.e. mod_bv, mod_codec2, mod_fsv, mod_ilbc, mod_silk, mod_siren 9. Removed mod_snipe_hunt (depricated by FS) Signed-off-by: Mazi Lo --- net/freeswitch/Config.in | 7 +- net/freeswitch/Makefile | 185 ++++++++++----------- net/freeswitch/patches/Makefile.am.patch | 57 ------- .../patches/build-config-erlang_m4.patch | 97 ----------- net/freeswitch/patches/build-modules_conf_in.patch | 10 -- .../patches/build-openwrt_rules.mk.patch | 10 -- net/freeswitch/patches/configure_ac.patch | 160 ------------------ net/freeswitch/patches/libs-apr-configure_ac.patch | 15 -- .../patches/libs-libzrtp-include-zrtp_config.patch | 20 --- .../patches/libs-sofia-sip-configure_gnu.patch | 8 - .../libs-spandsp-src-spandsp-fast_convert_h.patch | 11 -- .../patches/libs-spandsp-src-t4_rx_c.patch | 11 -- .../patches/libs-spandsp-src-t4_tx_c.patch | 11 -- .../patches/libs-srtp-configure-ac.patch | 18 -- .../patches/libs-xmlrpc-c-config_mk_in.patch | 13 -- ...libs-xmlrpc-c-lib-expat-gennmtab-Makefile.patch | 16 -- .../patches/musl/build-config-erlang_m4.patch | 97 +++++++++++ .../patches/musl/build-modules_conf_in.patch | 10 ++ .../patches/musl/build-openwrt_rules.mk.patch | 10 ++ net/freeswitch/patches/musl/configure_ac.patch | 65 ++++++++ .../patches/musl/libs-apr-configure_ac.patch | 15 ++ .../patches/musl/libs-apr-util-configure_gnu.patch | 8 + .../patches/musl/libs-srtp-configure_ac.patch | 13 ++ .../patches/patched-13ubuntu-configure_in.patch | 24 --- net/freeswitch/patches/src-Makefile_am.patch | 15 -- .../src-mod-codecs-mod_celt-Makefile_am.patch | 11 -- .../src-mod-codecs-mod_isac-typedefs_h.patch | 11 -- .../src-mod-codecs-mod_opus-Makefile_am.patch | 11 -- .../src-mod-directories-mod_ldap-Makefile_am.patch | 11 -- ...src-mod-endpoints-mod_gsmopen-Makefile_am.patch | 11 -- .../src-mod-endpoints-mod_verto-Makefile_am.patch | 28 ---- .../src-mod-languages-mod_perl-Makefile_am.patch | 32 ---- net/freeswitch/patches/src-switch_rtp_c.patch | 20 --- .../patches/uClibc/build-config-erlang_m4.patch | 97 +++++++++++ .../patches/uClibc/build-modules_conf_in.patch | 10 ++ .../patches/uClibc/build-openwrt_rules.mk.patch | 10 ++ net/freeswitch/patches/uClibc/configure_ac.patch | 65 ++++++++ .../patches/uClibc/libs-apr-configure_ac.patch | 15 ++ .../uClibc/libs-apr-util-configure_gnu.patch | 8 + .../patches/uClibc/libs-srtp-configure_ac.patch | 13 ++ 40 files changed, 529 insertions(+), 730 deletions(-) delete mode 100644 net/freeswitch/patches/Makefile.am.patch delete mode 100644 net/freeswitch/patches/build-config-erlang_m4.patch delete mode 100644 net/freeswitch/patches/build-modules_conf_in.patch delete mode 100644 net/freeswitch/patches/build-openwrt_rules.mk.patch delete mode 100644 net/freeswitch/patches/configure_ac.patch delete mode 100644 net/freeswitch/patches/libs-apr-configure_ac.patch delete mode 100644 net/freeswitch/patches/libs-libzrtp-include-zrtp_config.patch delete mode 100644 net/freeswitch/patches/libs-sofia-sip-configure_gnu.patch delete mode 100644 net/freeswitch/patches/libs-spandsp-src-spandsp-fast_convert_h.patch delete mode 100644 net/freeswitch/patches/libs-spandsp-src-t4_rx_c.patch delete mode 100644 net/freeswitch/patches/libs-spandsp-src-t4_tx_c.patch delete mode 100644 net/freeswitch/patches/libs-srtp-configure-ac.patch delete mode 100644 net/freeswitch/patches/libs-xmlrpc-c-config_mk_in.patch delete mode 100644 net/freeswitch/patches/libs-xmlrpc-c-lib-expat-gennmtab-Makefile.patch create mode 100644 net/freeswitch/patches/musl/build-config-erlang_m4.patch create mode 100644 net/freeswitch/patches/musl/build-modules_conf_in.patch create mode 100644 net/freeswitch/patches/musl/build-openwrt_rules.mk.patch create mode 100644 net/freeswitch/patches/musl/configure_ac.patch create mode 100644 net/freeswitch/patches/musl/libs-apr-configure_ac.patch create mode 100644 net/freeswitch/patches/musl/libs-apr-util-configure_gnu.patch create mode 100644 net/freeswitch/patches/musl/libs-srtp-configure_ac.patch delete mode 100644 net/freeswitch/patches/patched-13ubuntu-configure_in.patch delete mode 100644 net/freeswitch/patches/src-Makefile_am.patch delete mode 100644 net/freeswitch/patches/src-mod-codecs-mod_celt-Makefile_am.patch delete mode 100644 net/freeswitch/patches/src-mod-codecs-mod_isac-typedefs_h.patch delete mode 100644 net/freeswitch/patches/src-mod-codecs-mod_opus-Makefile_am.patch delete mode 100644 net/freeswitch/patches/src-mod-directories-mod_ldap-Makefile_am.patch delete mode 100644 net/freeswitch/patches/src-mod-endpoints-mod_gsmopen-Makefile_am.patch delete mode 100644 net/freeswitch/patches/src-mod-endpoints-mod_verto-Makefile_am.patch delete mode 100644 net/freeswitch/patches/src-mod-languages-mod_perl-Makefile_am.patch delete mode 100644 net/freeswitch/patches/src-switch_rtp_c.patch create mode 100644 net/freeswitch/patches/uClibc/build-config-erlang_m4.patch create mode 100644 net/freeswitch/patches/uClibc/build-modules_conf_in.patch create mode 100644 net/freeswitch/patches/uClibc/build-openwrt_rules.mk.patch create mode 100644 net/freeswitch/patches/uClibc/configure_ac.patch create mode 100644 net/freeswitch/patches/uClibc/libs-apr-configure_ac.patch create mode 100644 net/freeswitch/patches/uClibc/libs-apr-util-configure_gnu.patch create mode 100644 net/freeswitch/patches/uClibc/libs-srtp-configure_ac.patch diff --git a/net/freeswitch/Config.in b/net/freeswitch/Config.in index d6a67ab..21a61ea 100644 --- a/net/freeswitch/Config.in +++ b/net/freeswitch/Config.in @@ -77,6 +77,11 @@ menu "Configuration" help Compile libs/apr-util with PostgreSQL support. + config FS_WITH_SQLITE2 + bool "SQLITE2" + help + Compile libs/apr-util with SQLITE2 support. + config FS_WITH_SQLITE3 bool "SQLITE3" help @@ -223,7 +228,7 @@ menu "Configuration" config FS_WITH_STUN bool "Enable stun module" - default n + default y help Enable stun module. diff --git a/net/freeswitch/Makefile b/net/freeswitch/Makefile index 9967f2b..c7fe02f 100644 --- a/net/freeswitch/Makefile +++ b/net/freeswitch/Makefile @@ -6,20 +6,21 @@ # # include $(TOPDIR)/rules.mk +-include perlmod.mk PKG_NAME:=freeswitch PKG_SOURCE_PROTO:=git PKG_DISTNAME:=$(PKG_NAME)_$(PKG_SOURCE_PROTO) -PKG_VERSION:=1.5.14 +PKG_VERSION:=1.5.final # # The latest FS git hash in PKG_SOURCE_VERSION can be obtained from # http://fisheye.freeswitch.org # -FS_WITH_DEFAULT_HEAD:=a4d877c189b331ea47bf3a75745006d4d873eee6 -PKG_SOURCE_URL:=https://stash.$(PKG_NAME).org/scm/fs/$(PKG_NAME).git +FS_WITH_DEFAULT_HEAD:=bff9aab850a911e27b316b016c62f91f657719cd +PKG_SOURCE_URL:=https://$(PKG_NAME).org/stash/scm/fs/$(PKG_NAME).git PKG_SOURCE_VERSION:=$(if $(CONFIG_FS_WITH_LATEST_HEAD),$(shell git ls-remote $(PKG_SOURCE_URL) HEAD|cut -f1),$(FS_WITH_DEFAULT_HEAD)) FS_WITH_DEFAULT_HEAD_SHORT:=$(shell echo $(FS_WITH_DEFAULT_HEAD)|cut -b -7) PKG_SOURCE_VERSION_SHORT:=$(shell echo $(PKG_SOURCE_VERSION)|cut -b -7) @@ -29,7 +30,10 @@ PKG_SOURCE:=$(PKG_SOURCE_SUBDIR)-$(if $(CONFIG_FS_WITH_LOCAL_SOURCE),$(FS_WITH_D PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_FIXUP:=libtool autoreconf +PATCH_DIR=./patches/$(CONFIG_LIBC) + + +PKG_FIXUP:=autoreconf PKG_BUILD_PARALLEL:=0 PKG_LICENSE:=MPL-1.1 @@ -44,6 +48,7 @@ PKG_BUILD_DEPENDS:= \ FS_WITH_CORE_LIBEDIT_SUPPORT:libedit \ FS_WITH_MYSQL:libmysqlclient \ FS_WITH_POSTGRESQL:libpq \ + FS_WITH_SQLITE2:libsqlite2 \ FS_WITH_SQLITE3:libsqlite3 \ FS_WITH_APR_SCTP:sctp \ @@ -75,6 +80,7 @@ FS_MOD_AVAILABLE:= \ conference \ console \ curl \ + cv \ dahdi-codec \ db \ dialplan-asterisk \ @@ -105,6 +111,7 @@ FS_MOD_AVAILABLE:= \ h26x \ h323 \ hash \ + hiredis \ html5 \ httapi \ http-cache \ @@ -112,6 +119,7 @@ FS_MOD_AVAILABLE:= \ isac \ java \ json-cdr \ + kazoo \ lcr \ ldap \ local-stream \ @@ -157,9 +165,9 @@ FS_MOD_AVAILABLE:= \ skel \ skinny \ skypopen \ + smpp \ sms \ snapshot \ - snipe-hunt \ sndfile \ snmp \ snom \ @@ -185,7 +193,7 @@ FS_MOD_AVAILABLE:= \ vmd \ voicemail \ voicemail-ivr \ - vp8 \ + vpx \ xml-cdr \ xml-curl \ xml-ldap \ @@ -219,6 +227,7 @@ PKG_CONFIG_DEPENDS:= \ CONFIG_FS_WITH_POSTGRESQL \ CONFIG_FS_WITH_PYTHON \ CONFIG_FS_WITH_SILENT_RULES \ + CONFIG_FS_WITH_SQLITE2 \ CONFIG_FS_WITH_SQLITE3 \ CONFIG_FS_WITH_SRTP \ CONFIG_FS_WITH_SRTP_GENERIC_AESICM \ @@ -258,7 +267,7 @@ 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 +libgdbm $(ICONV_DEPENDS) $(INTL_DEPENDS) +libjpeg +libncurses +libopenldap +libpcre +libpthread +librt +libspeex +libspeexdsp +FS_WITH_SQLITE3:libsqlite3 +FS_WITH_SRTP:libsrtp +SSP_SUPPORT:libssp +libstdcpp +libuuid +PACKAGE_$(PKG_NAME)-mod-perl:perl + 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_SQLITE2:libsqlite2 +FS_WITH_SQLITE3:libsqlite3 +FS_WITH_SRTP:libsrtp +SSP_SUPPORT:libssp +libstdcpp +libuuid +PACKAGE_$(PKG_NAME)-mod-perl:perl +libvpx endef @@ -459,11 +468,6 @@ endef MAKE_INSTALL_TARGETS:=install -ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-celt),) - $(eval $(call Download/files,celt,celt-0.10.0.tar.gz,a656f6176e9be84027c0e51ceedd710f,,downloads/libs/,libs/)) -endif - - ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-curl),) $(eval $(call Download/files,json-cdr,json-c-0.9.tar.gz,4653b3b9c568bb9c782178abfaac128d,,downloads/libs/,libs/)) endif @@ -474,26 +478,11 @@ ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-event-zmq),) endif -ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-flite),) - $(eval $(call Download/files,flite,flite-2.0.0-release.tar.bz2,645db96ffc296cbb6d37f231cc1cc6b2,,downloads/libs/,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)-mod-opus),) - $(eval $(call Download/files,opus,opus-1.1-p2.tar.gz,5da7cb39925bfb7dd60ea2e810f71357,,downloads/libs/,libs/)) -endif - - -ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-ldap)|$(CONFIG_PACKAGE_$(PKG_NAME)-mod-xml-ldap),) - $(eval $(call Download/files,ldap,openldap-2.4.19.tar.gz,4a6dab2711fcf141f19bb680bc335887,,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 @@ -558,21 +547,24 @@ ifneq ($(CONFIG_USE_EGLIBC),) endif -FS_TARGET_CFLAGS:= $(TARGET_CFLAGS) -DLUA_USE_LINUX $(FPIC) -std=gnu99 -Wno-format -Wno-unused-variable -Wno-unused-but-set-variable -Wno-implicit-function-declaration -FS_TARGET_CXXFLAGS:= $(TARGET_CXXFLAGS) -FS_TARGET_CPPFLAGS:= -I. -I./lua $(TARGET_CPPFLAGS) $(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-json-cdr),-Wno-error) -I`ls -d $(PKG_BUILD_DIR)/libs/*|grep tiff`/libtiff -I$(PKG_BUILD_DIR)/libs/spandsp/src +ifeq ($(CONFIG_LIBC),musl) + TARGET_CFLAGS += -D_GNU_SOURCE +endif +#FS_TARGET_CFLAGS:= $(TARGET_CFLAGS) -DLUA_USE_LINUX $(FPIC) -std=gnu99 -Wno-format -Wno-unused-variable -Wno-unused-but-set-variable -Wno-implicit-function-declaration +#FS_TARGET_CXXFLAGS:= $(TARGET_CXXFLAGS) +#FS_TARGET_CPPFLAGS:= -I. -I./lua $(TARGET_CPPFLAGS) $(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-json-cdr),-Wno-error) -I`ls -d $(PKG_BUILD_DIR)/libs/*|grep tiff`/libtiff -I$(PKG_BUILD_DIR)/libs/spandsp/src #MAKE_FLAGS += \ # OPT_FLAGS+="$(TARGET_CFLAGS)" -MAKE_VARS += \ - 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 += \ +# 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)" \ CONFIGURE_ARGS+= \ @@ -582,7 +574,7 @@ CONFIGURE_ARGS+= \ --bindir="/usr/bin" \ --libdir="/usr/lib" \ --srcdir="$(PKG_BUILD_DIR)" \ - --sysconfdir="/etc/$(PKG_NAME)" \ + --sysconfdir="/etc" \ --with-modinstdir="/usr/lib/$(PKG_NAME)" \ --with-random="/dev/urandom" \ $(call autoconf_bool,CONFIG_FS_WITH_BUILTIN_ZRTP,zrtp) \ @@ -609,59 +601,64 @@ CONFIGURE_ARGS+= \ $(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-celt),--with-ogg="$(STAGING_DIR)/usr",--without-ogg) \ $(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)",--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_SQLITE2),,out)-sqlite2 \ --with$(if $(CONFIG_FS_WITH_SQLITE3),,out)-sqlite3 \ -ifeq ($(ARCH),arm) +ifeq ($(CONFIG_TARGET_ARCH_PACKAGES),"kirkwood") CONFIGURE_ARGS+= --enable-arm5e-asm \ endif -CONFIGURE_VARS+= \ - config_TARGET_CC="$(TOOLCHAIN_DIR)/bin/$(TARGET_CC)" \ - config_TARGET_CXX="$(TOOLCHAIN_DIR)/bin/$(TARGET_CXX)" \ - config_TARGET_CFLAGS="$(FS_TARGET_CPPFLAGS) $(FS_TARGET_CFLAGS)" \ - config_TARGET_CXXFLAGS="$(FS_TARGET_CPPFLAGS) $(FS_TARGET_CXXFLAGS)" \ - config_TARGET_CPPFLAGS="$(FS_TARGET_CPPFLAGS)" \ - config_TARGET_READLINE_INC="$(FS_TARGET_CPPFLAGS)" \ - config_TARGET_READLINE_LIBS="-lreadline -lncurses" \ - config_TARGET_LIBS="-lpthread -ldl" \ - config_BUILD_CC="$(HOSTCC)" \ - CC_FOR_BUILD="$(HOSTCC)" \ - BUILDTOOL_CC="$(HOSTCC)" \ - BUILDTOOL_CCLD="$(HOSTCC)" \ - CC="$(TOOLCHAIN_DIR)/bin/$(TARGET_CC)" \ - CXX="$(TOOLCHAIN_DIR)/bin/$(TARGET_CXX)" \ - AR="$(TOOLCHAIN_DIR)/bin/$(TARGET_CROSS)ar" \ - RANLIB="$(TOOLCHAIN_DIR)/bin/$(TARGET_CROSS)ranlib" \ - CFLAGS="$(FS_TARGET_CPPFLAGS) $(FS_TARGET_CFLAGS)" \ - CXXFLAGS="$(FS_TARGET_CPPFLAGS) $(FS_TARGET_CXXFLAGS)" \ - CPPFLAGS="$(FS_TARGET_CPPFLAGS)" \ - LDFLAGS="-L$(STAGING_DIR)/usr/lib/perl5/5.20/CORE -Wl,-rpath-link=\"$(STAGING_DIR)/usr/lib\" -Wl,-rpath-link=\"$(STAGING_DIR)/usr/lib$(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-perl),/perl5/5.20/CORE)\" -Wl,-rpath,/usr/lib -Wl,-rpath,/usr/lib$(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-perl),/perl5/5.20/CORE -lperl -lpthread -lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc)" \ - HOST_CC="/usr/bin/cc" \ - HOST_CXX="/usr/bin/g++" \ - CROSS_COMPILE="1" \ - $(if $(CONFIG_FS_WITH_APR_SCTP),ac_cv_header_netinet_sctp_h="yes") \ - ac_cv_file_dbd_apr_dbd_mysql_c="no" \ +#ifeq ($(CONFIG_LIBC),"uClibc") +ifeq ($(CONFIG_ARCH),"mips") + CONFIGURE_VARS+= \ + ac_cv_file_dbd_apr_dbd_mysql_c="no" \ + +endif +#endif + + +#CONFIGURE_VARS+= \ +# config_TARGET_CC="$(TOOLCHAIN_DIR)/bin/$(TARGET_CC)" \ +# config_TARGET_CXX="$(TOOLCHAIN_DIR)/bin/$(TARGET_CXX)" \ +# config_TARGET_CFLAGS="$(FS_TARGET_CPPFLAGS) $(FS_TARGET_CFLAGS)" \ +# config_TARGET_CXXFLAGS="$(FS_TARGET_CPPFLAGS) $(FS_TARGET_CXXFLAGS)" \ +# config_TARGET_CPPFLAGS="$(FS_TARGET_CPPFLAGS)" \ +# config_TARGET_READLINE_INC="$(FS_TARGET_CPPFLAGS)" \ +# config_TARGET_READLINE_LIBS="-lreadline -lncurses" \ +# config_TARGET_LIBS="-lpthread -ldl" \ +# config_BUILD_CC="$(HOSTCC)" \ +# CC_FOR_BUILD="$(HOSTCC)" \ +# BUILDTOOL_CC="$(HOSTCC)" \ +# BUILDTOOL_CCLD="$(HOSTCC)" \ +# CC="$(TOOLCHAIN_DIR)/bin/$(TARGET_CC)" \ +# CXX="$(TOOLCHAIN_DIR)/bin/$(TARGET_CXX)" \ +# AR="$(TOOLCHAIN_DIR)/bin/$(TARGET_CROSS)ar" \ +# RANLIB="$(TOOLCHAIN_DIR)/bin/$(TARGET_CROSS)ranlib" \ +# CFLAGS="$(FS_TARGET_CPPFLAGS) $(FS_TARGET_CFLAGS)" \ +# CXXFLAGS="$(FS_TARGET_CPPFLAGS) $(FS_TARGET_CXXFLAGS)" \ +# CPPFLAGS="$(FS_TARGET_CPPFLAGS)" \ +# LDFLAGS="-L$(STAGING_DIR)/usr/lib/perl5/$(PERL_VERSION)/CORE -Wl,-rpath-link=\"$(STAGING_DIR)/usr/lib\" -Wl,-rpath-link=\"$(STAGING_DIR)/usr/lib$(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-perl),/perl5/$(PERL_VERSION)/CORE)\" -Wl,-rpath,/usr/lib -Wl,-rpath,/usr/lib$(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-perl),/perl5/$(PERL_VERSION)/CORE -lperl -lpthread -lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc)" \ +# HOST_CC="/usr/bin/cc" \ +# HOST_CXX="/usr/bin/g++" \ +# CROSS_COMPILE="1" \ +# $(if $(CONFIG_FS_WITH_APR_SCTP),ac_cv_header_netinet_sctp_h="yes") \ +# ac_cv_file_dbd_apr_dbd_mysql_c="no" \ define Build/Prepare $(call Build/Prepare/Default) - $(call Prepare/celt) $(call Prepare/event-zmq) - $(call Prepare/flite) $(call Prepare/json-cdr) - $(call Prepare/ldap) $(call Prepare/mongo) - $(call Prepare/opus) $(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)) @@ -673,12 +670,11 @@ define Build/Prepare 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 - (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) - (cd $(PKG_BUILD_DIR); $(AM_TOOL_PATHS) ./bootstrap.sh) $(foreach m,$(FS_MOD_AVAILABLE), $(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-$(m)), $(SED) 's|^[ #]*\([^#]*/mod_$(subst -,_,$(m))\)$$$$|\1|g' $(PKG_BUILD_DIR)/modules.conf @@ -700,14 +696,6 @@ define Build/Compile endef -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/include $(1)/usr - $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib$(PKG_NAME).{a,so*} $(1)/usr/lib/ -endef - - define Package/$(PKG_NAME)/install $(INSTALL_DIR) $(1)/etc/config $(INSTALL_DIR) $(1)/etc/default @@ -716,7 +704,6 @@ define Package/$(PKG_NAME)/install $(INSTALL_DIR) $(1)/etc/hotplug.d/iface $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_DIR) $(1)/usr/include $(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib/pkgconfig $(INSTALL_BIN) ./files/$(PKG_NAME).init $(1)/etc/init.d/$(PKG_NAME) @@ -724,7 +711,6 @@ define Package/$(PKG_NAME)/install $(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/include $(1)/usr/ $(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) @@ -976,7 +962,7 @@ $(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,,,,)) +$(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,,,,)) @@ -986,11 +972,12 @@ $(eval $(call BuildPlugin,celt,CELT Ultra-Low Delay Codec,vanilla,,,,+libogg)) $(eval $(call BuildPlugin,cepstral,Cepstral Interface,vanilla,,,,@BROKEN)) # needs $(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,,,,,)) +$(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,,,,)) @@ -1001,7 +988,7 @@ $(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 @BROKEN)) +$(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,event-multicast,Multicast Event Handler,vanilla,,,,)) @@ -1010,29 +997,31 @@ $(eval $(call BuildPlugin,event-zmq,Socket Event Handler By Zero MQ,vanilla,,,,+ $(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,,,,@(!(armeb||avr32)||BROKEN))) +$(eval $(call BuildPlugin,flite,Festival TTS,vanilla,,,,+flite @(!(armeb||avr32)||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,,,,)) +$(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,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,,,,+hiredis @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,,,,)) +$(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,,,,)) +$(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)) @@ -1040,16 +1029,16 @@ $(eval $(call BuildPlugin,mp4,MP4 File Format Support For Video,vanilla,,,,@BROK $(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,,,,)) +$(eval $(call BuildPlugin,opus,Opus CoDec,vanilla,,,,+libopus)) $(eval $(call BuildPlugin,oreka,Media Recording with Oreka,vanilla,,,,)) -$(eval $(call BuildPlugin,perl,Perl Language Interface,vanilla,,lib/perl5/5.20/$(PKG_NAME).la lib/perl5/5.20/$(PKG_NAME).pm lib/perl5/5.20/$(PKG_NAME).so,,+perl +libdb47 +libgdbm @ROKEN)) +$(eval $(call BuildPlugin,perl,Perl Language Interface,vanilla,,lib/perl5/$(PERL_VERSION)/$(PKG_NAME).la lib/perl5/$(PERL_VERSION)/$(PKG_NAME).pm lib/perl5/$(PERL_VERSION)/$(PKG_NAME).so,,+perl +libdb47 +libgdbm @BROKEN)) $(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,python,Python Language Interface,vanilla,,,,python @BROKEN)) $(eval $(call BuildPlugin,radius-cdr,Radius-CDR interface,vanilla,,,,@BROKEN)) # fails in freeradius-client $(eval $(call BuildPlugin,rayo,Rayo server & node implementation,vanilla,,,,)) -$(eval $(call BuildPlugin,redis,Redis Limited Backend,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,,,,)) @@ -1067,15 +1056,15 @@ $(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,,,,)) -$(eval $(call BuildPlugin,siren,G.722.1 Codec,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,,,,)) $(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,,,,)) -$(eval $(call BuildPlugin,snipe-hunt,Snipe Hunt (Simple Example Module),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 @@ -1096,15 +1085,15 @@ $(eval $(call BuildPlugin,tone-stream,Tone Generation Stream,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,,lib/perl5/5.20/MCAST.so lib/perl5/5.20/MCAST.la lib/perl5/5.20/MCAST.pm,perl rtc,@BROKEN)) +$(eval $(call BuildPlugin,verto,HTML5 Verto interface,vanilla,,lib/perl5/$(PERL_VERSION)/MCAST.so lib/perl5/$(PERL_VERSION)/MCAST.la lib/perl5/$(PERL_VERSION)/MCAST.pm,perl rtc,+perl @BROKEN)) $(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,vp8,VP8 Video Codec,vanilla,,,,)) +$(eval $(call BuildPlugin,vpx,VP8/9 Video Codec with transcoding,vanilla,,,,+libvpx)) $(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,,,,+freeradius-client @BROKEN)) # freeradius-client isn't yet supported by OpenWRT. $(eval $(call BuildPlugin,xml-scgi,SCGI XML Gateway,vanilla,,,,)) -$(eval $(call BuildPlugin,yaml,YAML language,vanilla,,,,+libyaml @BROKEN)) +$(eval $(call BuildPlugin,yaml,YAML language,vanilla,,,,+libyaml)) diff --git a/net/freeswitch/patches/Makefile.am.patch b/net/freeswitch/patches/Makefile.am.patch deleted file mode 100644 index 00f5a31..0000000 --- a/net/freeswitch/patches/Makefile.am.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,3 +1,7 @@ -+BASE=. -+ -+include $(BASE)/build/openwrt_rules.mk -+ - EXTRA_DIST = - SUBDIRS = . src build - AUTOMAKE_OPTIONS = foreign subdir-objects -@@ -172,7 +176,6 @@ ZRTP_LIBS = -lbn -lzrtp - libfreeswitch_la_LDFLAGS += $(ZRTP_LDFLAGS) - libfreeswitch_la_LIBADD += $(ZRTP_LIBS) - CORE_LIBS += libs/libzrtp/libzrtp.a --LIBS += libs/libzrtp/third_party/bnlib/libbn.a - endif - - library_includedir = $(includedir) -@@ -311,7 +314,7 @@ endif - $(libfreeswitch_la_SOURCES): $(CORE_LIBS) $(switch_builddir)/modules.conf - - src/include/switch_swigable_cpp.h: $(switch_srcdir)/src/include/switch_cpp.h -- cat $(switch_srcdir)/src/include/switch_cpp.h | perl $(switch_srcdir)/build/strip.pl > $(switch_srcdir)/src/include/switch_swigable_cpp.h -+ cat $(switch_srcdir)/src/include/switch_cpp.h | $(STAGING_DIR)/../host/usr/bin/perl $(switch_srcdir)/build/strip.pl > $(switch_srcdir)/src/include/switch_swigable_cpp.h - # $(CC) -E $(switch_srcdir)/src/include/switch_cpp.h \ - # -I$(switch_srcdir)/src/include -I$(switch_srcdir)/libs/libteletone/src \ - # -DSWITCH_DECLARE_CLASS= -DSWITCH_DECLARE\(x\)=x -DSWITCH_DECLARE_CONSTRUCTOR= \ -@@ -374,7 +377,7 @@ fs_ivrd_LDFLAGS = $(AM_LDFLAGS) -lpthrea - nodist_freeswitch_SOURCES = src/include/switch_version.h - freeswitch_SOURCES = src/switch.c - freeswitch_CFLAGS = $(AM_CFLAGS) $(CORE_CFLAGS) --freeswitch_LDFLAGS = $(AM_LDFLAGS) -lpthread -rpath $(libdir) -+freeswitch_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS) $(LIBS) -lpthread - freeswitch_LDADD = libfreeswitch.la libs/apr/libapr-1.la - - if HAVE_ODBC -@@ -633,7 +636,9 @@ sndfile-reconf: - - tiff-reconf: - cd libs/tiff-4.0.2 && autoreconf -fi -- cd libs/tiff-4.0.2 && sh ./configure.gnu $(MY_DEFAULT_ARGS) -+ cd libs/tiff-4.0.2 && sh ./configure.gnu $(MY_DEFAULT_ARGS) --host="$(GNU_TARGET_NAME)" --prefix="/usr" -+ cd libs/spandsp && autoreconf -fi -+ cd libs/spandsp && sh ./configure.gnu $(MY_DEFAULT_ARGS) --host="$(GNU_TARGET_NAME)" --prefix="/usr" - cd libs/tiff-4.0.2 && make - - python-reconf: -@@ -658,9 +663,6 @@ iks-reconf: - $(MAKE) mod_dingaling-clean - - spandsp-reconf: tiff-reconf -- cd libs/spandsp && $(MAKE) clean || echo -- cd libs/spandsp && autoreconf -fi -- cd libs/spandsp && sh ./configure.gnu $(MY_DEFAULT_ARGS) - cd libs/spandsp && $(MAKE) - - sofia-reconf: diff --git a/net/freeswitch/patches/build-config-erlang_m4.patch b/net/freeswitch/patches/build-config-erlang_m4.patch deleted file mode 100644 index ebf79b7..0000000 --- a/net/freeswitch/patches/build-config-erlang_m4.patch +++ /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], -@@ -19,22 +19,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]) -@@ -42,9 +43,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]) -@@ -58,10 +66,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"], -@@ -75,7 +84,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]) - fi -@@ -85,12 +94,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/build-modules_conf_in.patch b/net/freeswitch/patches/build-modules_conf_in.patch deleted file mode 100644 index 26aad5b..0000000 --- a/net/freeswitch/patches/build-modules_conf_in.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/build/modules.conf.in -+++ b/build/modules.conf.in -@@ -35,6 +35,7 @@ applications/mod_httapi - #applications/mod_rad_auth - #applications/mod_redis - #applications/mod_rss -+#applications/mod_skel - #applications/mod_sonar - applications/mod_sms - #applications/mod_snapshot diff --git a/net/freeswitch/patches/build-openwrt_rules.mk.patch b/net/freeswitch/patches/build-openwrt_rules.mk.patch deleted file mode 100644 index 31fb16f..0000000 --- a/net/freeswitch/patches/build-openwrt_rules.mk.patch +++ /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/configure_ac.patch b/net/freeswitch/patches/configure_ac.patch deleted file mode 100644 index 86386ec..0000000 --- a/net/freeswitch/patches/configure_ac.patch +++ /dev/null @@ -1,160 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -229,13 +229,16 @@ 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 - # libjs - export ac_cv_va_copy=yes -+ # sofia-sip -+ export ac_cv_dev_urandom=yes - # srtp - export ac_cv_file__dev_urandom=yes -+ export ac_cv_file___dev_urandom_=yes - # rpl_malloc - export ac_cv_func_realloc_0_nonnull=yes - export ac_cv_func_malloc_0_nonnull=yes -@@ -248,7 +251,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 -@@ -379,9 +382,6 @@ elif test "x${ax_cv_c_compiler_vendor}" - elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then - APR_ADDTO(SWITCH_AM_CFLAGS, -fPIC) - APR_ADDTO(SWITCH_AM_CXXFLAGS, -fPIC) -- if test "$ac_cv_gcc_supports_w_no_unused_result" = yes; then -- APR_ADDTO(SWITCH_AM_CFLAGS, -Werror) -- fi - if test "${enable_64}" = "yes"; then - case "$host" in - *darwin*) -@@ -861,7 +861,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],,,[ -@@ -1177,14 +1176,14 @@ case $host in - ;; - esac - --if ! (test -x "$PKG_CONFIG" || test -x "$(which pkg-config)"); then -- AC_MSG_ERROR([You need to install pkg-config to configure FreeSWITCH.]) -+if ! test -x "${STAGING_DIR}/../host/bin/pkg-config"; then -+ AC_MSG_ERROR([Missing tools/pkg-config package needed to configure FreeSWITCH.]) - fi - --# temporary workaround for Debian libldns-dev package bug --if test "$cross_compiling" != "yes" && test -f /usr/lib/pkg-config/libldns.pc; then -- path_push_unique PKG_CONFIG_PATH /usr/lib/pkg-config --fi -+# -+# Workaround for OpenWRT pkg-config -+# -+path_push_unique PKG_CONFIG_PATH ${STAGING_DIR}/usr/lib/pkg-config - - module_enabled() { - grep -v -e "\#" -e "^\$" modules.conf | sed -e "s|^.*/||" | grep "^${1}\$" >/dev/null -@@ -1205,7 +1204,7 @@ PKG_CHECK_MODULES([LDNS], [libldns >= 1. - AC_CHECK_LIB([ldns], [ldns_str2rdf_a], [LDNS_LIBS=-lldns]) - AS_IF([test -z "$LDNS_LIBS"],[ - if module_enabled mod_enum; then -- AC_MSG_ERROR([You need to either install libldns-dev or disable mod_enum in modules.conf]) -+ AC_MSG_ERROR([You need to either install libldns or disable mod_enum in modules.conf]) - else - AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_LDNS],[false]) - fi],[ -@@ -1287,18 +1286,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],[ac_cv_have_perl=yes],[ac_cv_have_perl=no],[${STAGING_DIR}/../host/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`" -+ PERL_SITELIB="/usr/lib/perl5/5.20" -+ PERL_SITEDIR="${STAGING_DIR}${PERL_SITELIB}" -+ PERL_COREDIR="${PERL_SITEDIR}/CORE" -+ PERL_INC="-I${PERL_COREDIR}" -+ PERL_CFLAGS="-w -DMULTIPLICITY -fwrapv -fno-strict-aliasing -pipe -fstack-protector ${PERL_INC} -DEMBED_PERL" -+ PERL_LIBDIR="-L${PERL_COREDIR}" -+ PERL_LIBS="-lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc " -+ PERL_LDFLAGS="${LDFLAGS} -lpthread ${PERL_LIBS}" - - save_CFLAGS="$CFLAGS" - CFLAGS="$PERL_CFLAGS" -@@ -1311,12 +1310,15 @@ if test "x$ac_cv_have_perl" != "xno"; th - AC_CHECK_LIB([perl], [perl_alloc], ac_cv_use_libperl=yes, ac_cv_use_libperl=no) - LDFLAGS="$save_LDFLAGS" - -- AC_SUBST(PERL_SITEDIR) -- AC_SUBST(PERL_LIBDIR) -- AC_SUBST(PERL_LIBS) -+ AC_SUBST(PERL) - AC_SUBST(PERL_CFLAGS) -- AC_SUBST(PERL_LDFLAGS) -+ AC_SUBST(PERL_COREDIR) - AC_SUBST(PERL_INC) -+ AC_SUBST(PERL_LDFLAGS) -+ AC_SUBST(PERL_LIBDIR) -+ AC_SUBST(PERL_LIBS) -+ AC_SUBST(PERL_SITEDIR) -+ AC_SUBST(PERL_SITELIB) - 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"]) -@@ -1325,17 +1327,19 @@ AM_CONDITIONAL([HAVE_PERL],[test "x$ac_c - # 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]) -+AC_CHECK_PROG([PHP],[php],[ac_cv_have_php=yes],[ac_cv_have_php=no],[${STAGING_DIR}/../host/usr/bin:/usr/bin]) -+PHP=$as_dir/$ac_word$ac_exec_ext -+ -+AC_CHECK_PROG([PHP_CONFIG],[php-config],[ac_cv_have_php_config=yes],[ac_cv_have_php_config=no],[${STAGING_DIR}/../host/usr/bin]) -+PHP_CONFIG=$as_dir/$ac_word$ac_exec_ext -+ - 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_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_LIBS="`$PHP_CONFIG --libs | sed -r 's/ ?-l(bz2|pcre|xml2|gssapi_krb5|krb5|k5crypto|com_err|history|z|readline|gmp|ssl|crypt(o|))//g;s/^/-lcrypto/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 --include-dir`" - 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) -@@ -1443,6 +1447,7 @@ then - AC_MSG_NOTICE([Your python seems OK, do not forget to enable mod_python in modules.conf]) - AC_SUBST([PYTHON_CFLAGS], [$PYTHON_CFLAGS]) - AC_SUBST([PYTHON_LDFLAGS], [$PYTHON_LDFLAGS]) -+ AC_SUBST([PYTHON_LIB], [$PYTHON_LIB]) - fi - else - AS_IF([test "$with_python" = "try"], diff --git a/net/freeswitch/patches/libs-apr-configure_ac.patch b/net/freeswitch/patches/libs-apr-configure_ac.patch deleted file mode 100644 index c4667dd..0000000 --- a/net/freeswitch/patches/libs-apr-configure_ac.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/libs/apr/configure.ac -+++ b/libs/apr/configure.ac -@@ -1956,7 +1956,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/libs-libzrtp-include-zrtp_config.patch b/net/freeswitch/patches/libs-libzrtp-include-zrtp_config.patch deleted file mode 100644 index 0463885..0000000 --- a/net/freeswitch/patches/libs-libzrtp-include-zrtp_config.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/libs/libzrtp/include/zrtp_config.h -+++ b/libs/libzrtp/include/zrtp_config.h -@@ -68,8 +68,16 @@ - * If the byte order is not specified manually in zrtp_config_user.h - try to detect it automatically - */ - #if !defined(ZRTP_BYTE_ORDER) -+#if defined(linux) || defined(__linux) - --#if defined(_i386_) || defined(i_386_) || defined(_X86_) || defined(x86) || defined(__i386__) || \ -+#include -+#if __BYTE_ORDER == __LITTLE_ENDIAN -+#define ZRTP_BYTE_ORDER ZBO_LITTLE_ENDIAN -+#elif __BYTE_ORDER == __BIG_ENDIAN -+#define ZRTP_BYTE_ORDER ZBO_BIG_ENDIAN -+#endif -+ -+#elif defined(_i386_) || defined(i_386_) || defined(_X86_) || defined(x86) || defined(__i386__) || \ - defined(__i386) || defined(_M_IX86) || defined(__I86__) - /* - * Generic i386 processor family, little-endian diff --git a/net/freeswitch/patches/libs-sofia-sip-configure_gnu.patch b/net/freeswitch/patches/libs-sofia-sip-configure_gnu.patch deleted file mode 100644 index 73b6172..0000000 --- a/net/freeswitch/patches/libs-sofia-sip-configure_gnu.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/libs/sofia-sip/configure.gnu -+++ b/libs/sofia-sip/configure.gnu -@@ -1,4 +1,4 @@ - #! /bin/sh - srcpath=$(dirname $0 2>/dev/null ) || srcpath="." --$srcpath/configure "$@" --with-pic --with-glib=no --disable-shared --without-doxygen --disable-stun -+$srcpath/configure "$@" --with-pic --with-glib=no --disable-shared --without-doxygen - diff --git a/net/freeswitch/patches/libs-spandsp-src-spandsp-fast_convert_h.patch b/net/freeswitch/patches/libs-spandsp-src-spandsp-fast_convert_h.patch deleted file mode 100644 index e2fb3da..0000000 --- a/net/freeswitch/patches/libs-spandsp-src-spandsp-fast_convert_h.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/libs/spandsp/src/spandsp/fast_convert.h -+++ b/libs/spandsp/src/spandsp/fast_convert.h -@@ -195,7 +195,7 @@ extern "C" - { - return (long int) (x); - } --#elif defined(__ppc__) || defined(__powerpc__) -+#elif 0 /* defined(__ppc__) || defined(__powerpc__) */ - static __inline__ long int lfastrint(register double x) - { - int res[2]; diff --git a/net/freeswitch/patches/libs-spandsp-src-t4_rx_c.patch b/net/freeswitch/patches/libs-spandsp-src-t4_rx_c.patch deleted file mode 100644 index 7fac540..0000000 --- a/net/freeswitch/patches/libs-spandsp-src-t4_rx_c.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/libs/spandsp/src/t4_rx.c -+++ b/libs/spandsp/src/t4_rx.c -@@ -50,7 +50,7 @@ - #include "spandsp/stdbool.h" - #endif - #include "floating_fudge.h" --#include -+#include - - #include "spandsp/telephony.h" - #include "spandsp/alloc.h" diff --git a/net/freeswitch/patches/libs-spandsp-src-t4_tx_c.patch b/net/freeswitch/patches/libs-spandsp-src-t4_tx_c.patch deleted file mode 100644 index ed36237..0000000 --- a/net/freeswitch/patches/libs-spandsp-src-t4_tx_c.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/libs/spandsp/src/t4_tx.c -+++ b/libs/spandsp/src/t4_tx.c -@@ -50,7 +50,7 @@ - #include "spandsp/stdbool.h" - #endif - #include "floating_fudge.h" --#include -+#include - - #include "spandsp/telephony.h" - #include "spandsp/alloc.h" diff --git a/net/freeswitch/patches/libs-srtp-configure-ac.patch b/net/freeswitch/patches/libs-srtp-configure-ac.patch deleted file mode 100644 index 6fbfeb5..0000000 --- a/net/freeswitch/patches/libs-srtp-configure-ac.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/libs/srtp/configure.ac -+++ b/libs/srtp/configure.ac -@@ -130,9 +130,12 @@ 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 Check for /dev/urandom ONLY when NOT cross compiling -+if test "$cross_compiling" != yes; then -+ AC_CHECK_FILE(/dev/urandom, DEV_URANDOM=/dev/urandom, -+ [AC_CHECK_FILE(/dev/random, DEV_URANDOM=/dev/random)]) -+fi - - dnl Checks for header files. - AC_HEADER_STDC diff --git a/net/freeswitch/patches/libs-xmlrpc-c-config_mk_in.patch b/net/freeswitch/patches/libs-xmlrpc-c-config_mk_in.patch deleted file mode 100644 index 79cb33e..0000000 --- a/net/freeswitch/patches/libs-xmlrpc-c-config_mk_in.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/libs/xmlrpc-c/config.mk.in -+++ b/libs/xmlrpc-c/config.mk.in -@@ -335,8 +335,8 @@ endif - # The cross compiling user can update config.mk or override - # BUILDTOOL_CC on a make command. - --BUILDTOOL_CC = $(CC) --BUILDTOOL_CCLD = $(CCLD) -+BUILDTOOL_CC = $(HOSTCC) -+BUILDTOOL_CCLD = $(HOSTCC) - - # Here are the commands 'make install' uses to install various kinds of files: - diff --git a/net/freeswitch/patches/libs-xmlrpc-c-lib-expat-gennmtab-Makefile.patch b/net/freeswitch/patches/libs-xmlrpc-c-lib-expat-gennmtab-Makefile.patch deleted file mode 100644 index d50d200..0000000 --- a/net/freeswitch/patches/libs-xmlrpc-c-lib-expat-gennmtab-Makefile.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/libs/xmlrpc-c/lib/expat/gennmtab/Makefile -+++ b/libs/xmlrpc-c/lib/expat/gennmtab/Makefile -@@ -1,3 +1,5 @@ -+TOPDIR=$(shell (cd $(SRCDIR)/../../../../..; pwd)) -+ - ifeq ($(SRCDIR),) - updir = $(shell echo $(dir $(1)) | sed 's/.$$//') - EXPATDIR := $(call updir,$(CURDIR)) -@@ -7,6 +9,7 @@ ifeq ($(SRCDIR),) - endif - SUBDIR := lib/expat/gennmtab - -+include $(TOPDIR)/rules.mk - include $(BLDDIR)/config.mk - - LDFLAGS = $(LADD) diff --git a/net/freeswitch/patches/musl/build-config-erlang_m4.patch b/net/freeswitch/patches/musl/build-config-erlang_m4.patch new file mode 100644 index 0000000..5d744f7 --- /dev/null +++ b/net/freeswitch/patches/musl/build-config-erlang_m4.patch @@ -0,0 +1,97 @@ +--- 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 new file mode 100644 index 0000000..9db0e8e --- /dev/null +++ b/net/freeswitch/patches/musl/build-modules_conf_in.patch @@ -0,0 +1,10 @@ +--- a/build/modules.conf.in ++++ b/build/modules.conf.in +@@ -38,6 +38,7 @@ applications/mod_httapi + #applications/mod_rad_auth + #applications/mod_redis + #applications/mod_rss ++#applications/mod_skel + applications/mod_sms + #applications/mod_snapshot + #applications/mod_snom diff --git a/net/freeswitch/patches/musl/build-openwrt_rules.mk.patch b/net/freeswitch/patches/musl/build-openwrt_rules.mk.patch new file mode 100644 index 0000000..31fb16f --- /dev/null +++ b/net/freeswitch/patches/musl/build-openwrt_rules.mk.patch @@ -0,0 +1,10 @@ +--- /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 new file mode 100644 index 0000000..9bd513d --- /dev/null +++ b/net/freeswitch/patches/musl/configure_ac.patch @@ -0,0 +1,65 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -254,7 +254,7 @@ 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 + # libjs +@@ -273,7 +273,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 +@@ -405,9 +405,6 @@ elif test "x${ax_cv_c_compiler_vendor}" + elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then + APR_ADDTO(SWITCH_AM_CFLAGS, -fPIC) + APR_ADDTO(SWITCH_AM_CXXFLAGS, -fPIC) +- if test "$ac_cv_gcc_supports_w_no_unused_result" = yes; then +- APR_ADDTO(SWITCH_AM_CFLAGS, -Werror) +- fi + if test "${enable_64}" = "yes"; then + case "$host" in + *darwin*) +@@ -901,7 +898,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],,,[ +@@ -1474,14 +1470,14 @@ AM_CONDITIONAL([HAVE_MYSQL],[test "$foun + # perl checks + # + +-AC_CHECK_PROG(PERL,perl,[ac_cv_have_perl=yes],[ac_cv_have_perl=no]) ++AC_CHECK_PROG(PERL,[perl],[ac_cv_have_perl=yes],[ac_cv_have_perl=no],[${STAGING_DIR}/../host/usr/bin]) ++PERL=$as_dir/$ac_word$ac_exec_ext + + # -a "x$ac_cv_have_EXTERN_h" != "xno" + + 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_SITEDIR="`$PERL -MConfig -e 'print $Config{archlibexp}'`" ++ PERL_LIBDIR="-L`$PERL -MConfig -e 'print $Config{archlibexp}'`/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||'`" +@@ -1498,6 +1494,7 @@ if test "x$ac_cv_have_perl" != "xno"; th + 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_LIBDIR) + AC_SUBST(PERL_LIBS) diff --git a/net/freeswitch/patches/musl/libs-apr-configure_ac.patch b/net/freeswitch/patches/musl/libs-apr-configure_ac.patch new file mode 100644 index 0000000..c4667dd --- /dev/null +++ b/net/freeswitch/patches/musl/libs-apr-configure_ac.patch @@ -0,0 +1,15 @@ +--- a/libs/apr/configure.ac ++++ b/libs/apr/configure.ac +@@ -1956,7 +1956,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 new file mode 100644 index 0000000..b933b3c --- /dev/null +++ b/net/freeswitch/patches/musl/libs-apr-util-configure_gnu.patch @@ -0,0 +1,8 @@ +--- 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 new file mode 100644 index 0000000..56c1691 --- /dev/null +++ b/net/freeswitch/patches/musl/libs-srtp-configure_ac.patch @@ -0,0 +1,13 @@ +--- 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/patched-13ubuntu-configure_in.patch b/net/freeswitch/patches/patched-13ubuntu-configure_in.patch deleted file mode 100644 index 1c397c0..0000000 --- a/net/freeswitch/patches/patched-13ubuntu-configure_in.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/configure.in -+++ b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/configure.in -@@ -56,21 +56,6 @@ dnl Checks for programs. - AC_PROG_CPP - AC_PROG_CXX - --dnl check for gcc 2.95.x --AC_TRY_RUN([ --#include --main() --{ --#if defined(__GNUC__) && \ -- ! (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)) -- return 1; --#endif -- return 0; --} --],, --[echo "need at least gcc 2.95 to compile correctly" --exit 1]) -- - dnl check for alloca - AC_FUNC_ALLOCA - diff --git a/net/freeswitch/patches/src-Makefile_am.patch b/net/freeswitch/patches/src-Makefile_am.patch deleted file mode 100644 index cb7e3a6..0000000 --- a/net/freeswitch/patches/src-Makefile_am.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/libs/libcodec2/src/Makefile.am -+++ b/libs/libcodec2/src/Makefile.am -@@ -88,6 +88,12 @@ codebookge.$(OBJEXT): codebookge.c - - codebook.lo: codebook.c - -+generate_codebook: -+ $(CC_FOR_BUILD) -o generate_codebook generate_codebook.c -lm -+ -+genlspdtcb: -+ $(CC_FOR_BUILD) -o genlspdtcb genlspdtcb.c -lm -+ - codebook.c: generate_codebook $(CODEBOOKS) - ./generate_codebook lsp_cb $(CODEBOOKS) > codebook.c - diff --git a/net/freeswitch/patches/src-mod-codecs-mod_celt-Makefile_am.patch b/net/freeswitch/patches/src-mod-codecs-mod_celt-Makefile_am.patch deleted file mode 100644 index 55d349a..0000000 --- a/net/freeswitch/patches/src-mod-codecs-mod_celt-Makefile_am.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/mod/codecs/mod_celt/Makefile.am -+++ b/src/mod/codecs/mod_celt/Makefile.am -@@ -19,7 +19,7 @@ $(CELT_DIR): - - $(CELT_BUILDDIR)/Makefile: $(CELT_DIR) - mkdir -p $(CELT_BUILDDIR) -- cd $(CELT_BUILDDIR) && $(DEFAULT_VARS) $(CELT_DIR)/configure $(DEFAULT_ARGS) --disable-shared --with-pic --srcdir=$(CELT_DIR) -+ cd $(CELT_BUILDDIR) && $(DEFAULT_VARS) $(CELT_DIR)/configure $(DEFAULT_ARGS) --disable-shared --with-pic --srcdir=$(CELT_DIR) --with-ogg=$(STAGING_DIR)/usr - $(TOUCH_TARGET) - - $(CELT_LA): $(CELT_BUILDDIR)/Makefile diff --git a/net/freeswitch/patches/src-mod-codecs-mod_isac-typedefs_h.patch b/net/freeswitch/patches/src-mod-codecs-mod_isac-typedefs_h.patch deleted file mode 100644 index 84de2af..0000000 --- a/net/freeswitch/patches/src-mod-codecs-mod_isac-typedefs_h.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/mod/codecs/mod_isac/typedefs.h -+++ b/src/mod/codecs/mod_isac/typedefs.h -@@ -66,7 +66,7 @@ - #define WEBRTC_ARCH_X86 - #define WEBRTC_ARCH_32_BITS - #define WEBRTC_ARCH_LITTLE_ENDIAN --#elif defined(__ARMEL__) -+#elif defined(__ARMEL__) || defined(__mips__) - // TODO(andrew): We'd prefer to control platform defines here, but this is - // currently provided by the Android makefiles. Commented to avoid duplicate - // definition warnings. diff --git a/net/freeswitch/patches/src-mod-codecs-mod_opus-Makefile_am.patch b/net/freeswitch/patches/src-mod-codecs-mod_opus-Makefile_am.patch deleted file mode 100644 index bedf1df..0000000 --- a/net/freeswitch/patches/src-mod-codecs-mod_opus-Makefile_am.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/mod/codecs/mod_opus/Makefile.am -+++ b/src/mod/codecs/mod_opus/Makefile.am -@@ -19,7 +19,7 @@ $(OPUS_DIR)/configure: - - $(OPUS_BUILDDIR)/Makefile: $(OPUS_DIR)/configure - mkdir -p $(OPUS_BUILDDIR) -- cd $(OPUS_BUILDDIR) && $(DEFAULT_VARS) $(OPUS_DIR)/configure $(MY_DEFAULT_ARGS) -+ cd $(OPUS_BUILDDIR) && $(DEFAULT_VARS) $(OPUS_DIR)/configure $(MY_DEFAULT_ARGS) --host=$(host) --disable-shared --with-pic --srcdir=$(OPUS_DIR) - $(TOUCH_TARGET) - - $(OPUS_LA): $(OPUS_BUILDDIR)/Makefile diff --git a/net/freeswitch/patches/src-mod-directories-mod_ldap-Makefile_am.patch b/net/freeswitch/patches/src-mod-directories-mod_ldap-Makefile_am.patch deleted file mode 100644 index 2872754..0000000 --- a/net/freeswitch/patches/src-mod-directories-mod_ldap-Makefile_am.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/mod/directories/mod_ldap/Makefile.am -+++ b/src/mod/directories/mod_ldap/Makefile.am -@@ -13,7 +13,7 @@ mod_ldap_la_CFLAGS = $(AM_CFLAGS) -DWI - mod_ldap_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(LDAPLA) $(LIBLBERLA) - mod_ldap_la_LDFLAGS = -avoid-version -module -no-undefined -shared - --MY_DEFAULT_ARGS= --build=$(build) --host=$(host) --target=$(target) --prefix="$(prefix)" --exec_prefix="$(exec_prefix)" --libdir="$(libdir)" --disable-slapd --disable-bdb --disable-hdb -+MY_DEFAULT_ARGS= --build=$(build) --host=$(host) --target=$(target) --prefix="$(prefix)" --exec_prefix="$(exec_prefix)" --libdir="$(libdir)" --with-yielding_select=yes --disable-slapd --disable-bdb --disable-hdb - - $(MODNAME).lo: $(LDAPLA) $(LIBLBERLA) - diff --git a/net/freeswitch/patches/src-mod-endpoints-mod_gsmopen-Makefile_am.patch b/net/freeswitch/patches/src-mod-endpoints-mod_gsmopen-Makefile_am.patch deleted file mode 100644 index 1d74422..0000000 --- a/net/freeswitch/patches/src-mod-endpoints-mod_gsmopen-Makefile_am.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/mod/endpoints/mod_gsmopen/Makefile.am -+++ b/src/mod/endpoints/mod_gsmopen/Makefile.am -@@ -12,7 +12,7 @@ SPANDSP_LA=$(SPANDSP_BUILDDIR)/src/libsp - mod_LTLIBRARIES = mod_gsmopen.la - mod_gsmopen_la_SOURCES = mod_gsmopen.cpp gsmopen_protocol.cpp - mod_gsmopen_la_CXXFLAGS = $(SWITCH_AM_CXXFLAGS) --mod_gsmopen_la_CPPFLAGS = -I$(SPANDSP_DIR)/src -I$(TIFF_DIR)/libtiff -I$(SPANDSP_BUILDDIR)/src -I$(TIFF_BUILDDIR)/libtiff -I. -+mod_gsmopen_la_CPPFLAGS = -I$(SPANDSP_DIR)/src -I$(TIFF_DIR)/libtiff -I$(SPANDSP_BUILDDIR)/src -I$(TIFF_BUILDDIR)/libtiff -I. -fpermissive - mod_gsmopen_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(SPANDSP_LA) $(TIFF_LA) - mod_gsmopen_la_LDFLAGS = -avoid-version -module -no-undefined -lctb-0.16 -lgsmme - diff --git a/net/freeswitch/patches/src-mod-endpoints-mod_verto-Makefile_am.patch b/net/freeswitch/patches/src-mod-endpoints-mod_verto-Makefile_am.patch deleted file mode 100644 index e1411aa..0000000 --- a/net/freeswitch/patches/src-mod-endpoints-mod_verto-Makefile_am.patch +++ /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 = "$(PERL_SITELIB)" -+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/src-mod-languages-mod_perl-Makefile_am.patch b/net/freeswitch/patches/src-mod-languages-mod_perl-Makefile_am.patch deleted file mode 100644 index c6a1588..0000000 --- a/net/freeswitch/patches/src-mod-languages-mod_perl-Makefile_am.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/src/mod/languages/mod_perl/Makefile.am -+++ b/src/mod/languages/mod_perl/Makefile.am -@@ -1,22 +1,22 @@ - 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="$(PERL_SITELIB)" -+ - 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 = $(AM_CFLAGS) - mod_perl_la_CXXFLAGS = $(AM_CXXFLAGS) --mod_perl_la_CPPFLAGS = -w -DMULTIPLICITY `$(PERL) -MExtUtils::Embed -e ccopts` -DEMBED_PERL -I$(switch_srcdir)/libs/libteletone/src/ -+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) -MExtUtils::Embed -e ldopts` `$(PERL) -MConfig -e 'print $$Config{libs}'` -+mod_perl_la_LDFLAGS = -avoid-version -module -no-undefined -shared ${PERL_LDFLAGS} - - 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 = -w -DMULTIPLICITY `$(PERL) -MExtUtils::Embed -e ccopts` -DEMBED_PERL -I$(switch_srcdir)/libs/libteletone/src/ -+freeswitch_la_CPPFLAGS = ${PERL_CFLAGS} -I$(switch_srcdir)/libs/libteletone/src/ -+ - reswig: swigclean mod_perl_wrap.cpp - - swigclean: clean diff --git a/net/freeswitch/patches/src-switch_rtp_c.patch b/net/freeswitch/patches/src-switch_rtp_c.patch deleted file mode 100644 index 343e4d9..0000000 --- a/net/freeswitch/patches/src-switch_rtp_c.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/src/switch_rtp.c -+++ b/src/switch_rtp.c -@@ -1535,7 +1535,7 @@ static void send_fir(switch_rtp_t *rtp_s - } - } - --#ifdef ENABLE_SRTP -+#ifdef ENABLE_ZRTP - end: - #endif - -@@ -1630,7 +1630,7 @@ static void send_pli(switch_rtp_t *rtp_s - } - } - --#ifdef ENABLE_SRTP -+#ifdef ENABLE_ZRTP - end: - #endif - return; diff --git a/net/freeswitch/patches/uClibc/build-config-erlang_m4.patch b/net/freeswitch/patches/uClibc/build-config-erlang_m4.patch new file mode 100644 index 0000000..5d744f7 --- /dev/null +++ b/net/freeswitch/patches/uClibc/build-config-erlang_m4.patch @@ -0,0 +1,97 @@ +--- 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 new file mode 100644 index 0000000..86aad26 --- /dev/null +++ b/net/freeswitch/patches/uClibc/build-modules_conf_in.patch @@ -0,0 +1,10 @@ +--- 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_snapshot + #applications/mod_snom diff --git a/net/freeswitch/patches/uClibc/build-openwrt_rules.mk.patch b/net/freeswitch/patches/uClibc/build-openwrt_rules.mk.patch new file mode 100644 index 0000000..31fb16f --- /dev/null +++ b/net/freeswitch/patches/uClibc/build-openwrt_rules.mk.patch @@ -0,0 +1,10 @@ +--- /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 new file mode 100644 index 0000000..85a2788 --- /dev/null +++ b/net/freeswitch/patches/uClibc/configure_ac.patch @@ -0,0 +1,65 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -254,7 +254,7 @@ 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 + # libjs +@@ -273,7 +273,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 +@@ -405,9 +405,6 @@ elif test "x${ax_cv_c_compiler_vendor}" + elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then + APR_ADDTO(SWITCH_AM_CFLAGS, -fPIC) + APR_ADDTO(SWITCH_AM_CXXFLAGS, -fPIC) +- if test "$ac_cv_gcc_supports_w_no_unused_result" = yes; then +- APR_ADDTO(SWITCH_AM_CFLAGS, -Werror) +- fi + if test "${enable_64}" = "yes"; then + case "$host" in + *darwin*) +@@ -901,7 +898,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],,,[ +@@ -1478,14 +1474,14 @@ AM_CONDITIONAL([HAVE_MYSQL],[test "$foun + # perl checks + # + +-AC_CHECK_PROG(PERL,perl,[ac_cv_have_perl=yes],[ac_cv_have_perl=no]) ++AC_CHECK_PROG(PERL,[perl],[ac_cv_have_perl=yes],[ac_cv_have_perl=no],[${STAGING_DIR}/../host/usr/bin]) ++PERL=$as_dir/$ac_word$ac_exec_ext + + # -a "x$ac_cv_have_EXTERN_h" != "xno" + + 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_SITEDIR="`$PERL -MConfig -e 'print $Config{archlibexp}'`" ++ PERL_LIBDIR="-L`$PERL -MConfig -e 'print $Config{archlibexp}'`/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||'`" +@@ -1502,6 +1498,7 @@ if test "x$ac_cv_have_perl" != "xno"; th + 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_LIBDIR) + AC_SUBST(PERL_LIBS) diff --git a/net/freeswitch/patches/uClibc/libs-apr-configure_ac.patch b/net/freeswitch/patches/uClibc/libs-apr-configure_ac.patch new file mode 100644 index 0000000..c4667dd --- /dev/null +++ b/net/freeswitch/patches/uClibc/libs-apr-configure_ac.patch @@ -0,0 +1,15 @@ +--- a/libs/apr/configure.ac ++++ b/libs/apr/configure.ac +@@ -1956,7 +1956,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 new file mode 100644 index 0000000..b933b3c --- /dev/null +++ b/net/freeswitch/patches/uClibc/libs-apr-util-configure_gnu.patch @@ -0,0 +1,8 @@ +--- 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 new file mode 100644 index 0000000..56c1691 --- /dev/null +++ b/net/freeswitch/patches/uClibc/libs-srtp-configure_ac.patch @@ -0,0 +1,13 @@ +--- 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) -- cgit From e8de05f00afddbd42bef324b4313e538ebfdbd15 Mon Sep 17 00:00:00 2001 From: John Papandriopoulos Date: Fri, 21 Aug 2015 17:11:54 -0700 Subject: iksemel: restore package and all dependent asterisk modules --- libs/iksemel/Makefile | 2 +- ...e-of-newer-gnutls_priority_set_direct-api.patch | 65 ++++++++++++++++++++++ net/asterisk-1.8.x/Makefile | 18 +++--- net/asterisk-11.x/Makefile | 15 ++++- net/asterisk-13.x/Makefile | 4 +- 5 files changed, 90 insertions(+), 14 deletions(-) create mode 100644 libs/iksemel/patches/002-use-of-newer-gnutls_priority_set_direct-api.patch diff --git a/libs/iksemel/Makefile b/libs/iksemel/Makefile index 8eff48b..8a33e3e 100644 --- a/libs/iksemel/Makefile +++ b/libs/iksemel/Makefile @@ -31,7 +31,7 @@ define Package/libiksemel CATEGORY:=Libraries TITLE:=Iksemel Jabber Library URL:=http://code.google.com/p/iksemel/ - DEPENDS:= +libgnutls +libtasn1 +libgcrypt +libgpg-error @BROKEN + DEPENDS:= +libgnutls +libtasn1 +libgcrypt +libgpg-error endef define Package/libiksemel/description diff --git a/libs/iksemel/patches/002-use-of-newer-gnutls_priority_set_direct-api.patch b/libs/iksemel/patches/002-use-of-newer-gnutls_priority_set_direct-api.patch new file mode 100644 index 0000000..8f91d10 --- /dev/null +++ b/libs/iksemel/patches/002-use-of-newer-gnutls_priority_set_direct-api.patch @@ -0,0 +1,65 @@ +From 6b213b593c5b499679506a8c169ff3f0f4d6a34f Mon Sep 17 00:00:00 2001 +From: John Papandriopoulos +Date: Thu, 20 Aug 2015 16:55:39 -0700 +Subject: [PATCH] Use of newer gnutls_priority_set_direct API + +--- + configure.ac | 1 + + src/stream.c | 13 +++++++++++++ + 2 files changed, 14 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 91e69e3..281a044 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -46,6 +46,7 @@ AC_CHECK_FUNCS(getopt_long) + AC_CHECK_FUNCS(getaddrinfo) + + AM_PATH_LIBGNUTLS(,AC_DEFINE(HAVE_GNUTLS,,"Use libgnutls")) ++AM_PATH_LIBGNUTLS(,AC_CHECK_FUNCS(gnutls_priority_set_direct)) + + dnl Check -Wall flag of GCC + if test "x$GCC" = "xyes"; then +diff --git a/src/stream.c b/src/stream.c +index e8a1e8c..7d19a82 100644 +--- a/src/stream.c ++++ b/src/stream.c +@@ -63,11 +63,20 @@ tls_pull (iksparser *prs, char *buffer, size_t len) + static int + handshake (struct stream_data *data) + { ++#if HAVE_GNUTLS_PRIORITY_SET_DIRECT ++ const char *priorities = ++ "NONE" ++ ":+VERS-TLS1.0:+VERS-SSL3.0" ++ ":+RSA" ++ ":+3DES-CBC:+ARCFOUR-128" ++ ":+SHA1:+SHA256:+SHA384:+MD5"; ++#else + const int protocol_priority[] = { GNUTLS_TLS1, GNUTLS_SSL3, 0 }; + const int kx_priority[] = { GNUTLS_KX_RSA, 0 }; + const int cipher_priority[] = { GNUTLS_CIPHER_3DES_CBC, GNUTLS_CIPHER_ARCFOUR, 0}; + const int comp_priority[] = { GNUTLS_COMP_ZLIB, GNUTLS_COMP_NULL, 0 }; + const int mac_priority[] = { GNUTLS_MAC_SHA, GNUTLS_MAC_MD5, 0 }; ++#endif + int ret; + + if (gnutls_global_init () != 0) +@@ -80,11 +89,15 @@ handshake (struct stream_data *data) + gnutls_certificate_free_credentials (data->cred); + return IKS_NOMEM; + } ++#if HAVE_GNUTLS_PRIORITY_SET_DIRECT ++ gnutls_priority_set_direct (data->sess, priorities, NULL); ++#else + gnutls_protocol_set_priority (data->sess, protocol_priority); + gnutls_cipher_set_priority(data->sess, cipher_priority); + gnutls_compression_set_priority(data->sess, comp_priority); + gnutls_kx_set_priority(data->sess, kx_priority); + gnutls_mac_set_priority(data->sess, mac_priority); ++#endif + gnutls_credentials_set (data->sess, GNUTLS_CRD_CERTIFICATE, data->cred); + + gnutls_transport_set_push_function (data->sess, (gnutls_push_func) tls_push); +-- +2.1.4 diff --git a/net/asterisk-1.8.x/Makefile b/net/asterisk-1.8.x/Makefile index 3dba03c..020ab32 100644 --- a/net/asterisk-1.8.x/Makefile +++ b/net/asterisk-1.8.x/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=asterisk18 PKG_VERSION:=1.8.32.3 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://downloads.asterisk.org/pub/telephony/asterisk/releases/ @@ -146,15 +146,15 @@ define Package/asterisk18-sounds/install rm -f $(1)/usr/lib/asterisk/sounds/conf-* endef -#ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk18-chan-gtalk),) -# CONFIGURE_ARGS+= \ -# --with-iksemel="$(STAGING_DIR)/usr" -# SITE_VARS+= \ -# ac_cv_lib_iksemel_iks_start_sasl=yes -#else +ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk18-chan-gtalk),) + CONFIGURE_ARGS+= \ + --with-iksemel="$(STAGING_DIR)/usr" + SITE_VARS+= \ + ac_cv_lib_iksemel_iks_start_sasl=yes +else CONFIGURE_ARGS+= \ --without-iksemel -#endif +endif ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk18-curl),) CONFIGURE_ARGS+= \ @@ -345,7 +345,7 @@ $(eval $(call BuildAsterisk18Module,func-shell,Shell,support for shell execution $(eval $(call BuildAsterisk18Module,func-uri,URI encoding and decoding,Encodes and decodes URI-safe strings,,,,func_uri,)) $(eval $(call BuildAsterisk18Module,func-vmcount,vmcount dialplan,a vmcount dialplan function,,,,func_vmcount,)) $(eval $(call BuildAsterisk18Module,chan-agent,Agents proxy channel,An implementation of agents proxy channel,,,,chan_agent,)) -#$(eval $(call BuildAsterisk18Module,chan-gtalk,GTalk,An implementation of chan_gtalk and res_jabber for GTalk support,+libiksemel,/etc/asterisk/gtalk.conf /etc/asterisk/jabber.conf,gtalk.conf jabber.conf,chan_gtalk res_jabber,)) +$(eval $(call BuildAsterisk18Module,chan-gtalk,GTalk,An implementation of chan_gtalk and res_jabber for GTalk support,+libiksemel,/etc/asterisk/gtalk.conf /etc/asterisk/jabber.conf,gtalk.conf jabber.conf,chan_gtalk res_jabber,)) $(eval $(call BuildAsterisk18Module,chan-iax2,IAX2 channel,An implementation of IAX2 channel,+asterisk18-res-timing-timerfd,/etc/asterisk/iax.conf /etc/asterisk/iaxprov.conf,iax.conf iaxprov.conf,chan_iax2,)) $(eval $(call BuildAsterisk18Module,chan-lantiq,Lantiq TAPI channel,An implementation of Lantiq TAPI channel,@TARGET_lantiq @!TARGET_lantiq_xrx200 +kmod-ltq-vmmc,/etc/asterisk/lantiq.conf,lantiq.conf,chan_lantiq,)) $(eval $(call BuildAsterisk18Module,chan-local,Local proxy channel,An implementation of local proxy channel,,,,chan_local,)) diff --git a/net/asterisk-11.x/Makefile b/net/asterisk-11.x/Makefile index b506ad1..fe3e19b 100644 --- a/net/asterisk-11.x/Makefile +++ b/net/asterisk-11.x/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=asterisk11 PKG_VERSION:=11.19.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://downloads.asterisk.org/pub/telephony/asterisk/releases/ @@ -221,6 +221,16 @@ else --without-srtp endif +ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk11-res-xmpp),) + CONFIGURE_ARGS+= \ + --with-iksemel="$(STAGING_DIR)/usr" + SITE_VARS+= \ + ac_cv_lib_iksemel_iks_start_sasl=yes +else + CONFIGURE_ARGS+= \ + --without-iksemel +endif + EXTRA_CFLAGS+= $(TARGET_CPPFLAGS) EXTRA_LDFLAGS+= $(TARGET_LDFLAGS) -Wl,-rpath-link,$(STAGING_DIR)/usr/lib CONFIGURE_ARGS+= \ @@ -233,7 +243,6 @@ CONFIGURE_ARGS+= \ --with-gsm=internal \ --without-gtk2 \ --with-ilbc=internal \ - --without-iksemel \ --without-isdnnet \ --without-libxml2 \ --without-misdn \ @@ -410,6 +419,7 @@ $(eval $(call BuildAsterisk11Module,chan-agent,Agents proxy channel,an implement $(eval $(call BuildAsterisk11Module,chan-dahdi,DAHDI channel,DAHDI channel support,+dahdi-tools-libtonezone +kmod-dahdi,/etc/asterisk/chan_dahdi.conf,chan_dahdi.conf,chan_dahdi,)) $(eval $(call BuildAsterisk11Module,chan-iax2,IAX2 channel,IAX support,+asterisk11-res-timing-timerfd,/etc/asterisk/iax.conf /etc/asterisk/iaxprov.conf,iax.conf iaxprov.conf,chan_iax2,)) $(eval $(call BuildAsterisk11Module,chan-mgcp,MGCP channel,the channel chan_mgcp,,/etc/asterisk/mgcp.conf,mgcp.conf,chan_mgcp,)) +$(eval $(call BuildAsterisk11Module,chan-motif,Jingle channel,Motif Jingle Channel Driver,+asterisk11-res-xmpp,/etc/asterisk/motif.conf /etc/asterisk/jingle.conf,motif.conf jingle.conf,chan_motif,)) $(eval $(call BuildAsterisk11Module,chan-ooh323,ooH323 channel,the channel chan_ooh323,,/etc/asterisk/ooh323.conf,ooh323.conf,chan_ooh323,)) $(eval $(call BuildAsterisk11Module,chan-skinny,Skinny channel,the channel chan_skinny,,/etc/asterisk/skinny.conf,skinny.conf,chan_skinny,)) $(eval $(call BuildAsterisk11Module,chan-unistim,Unistim channel,channel driver for the UNISTIM (Unified Networks IP Stimulus) protocol,,/etc/asterisk/unistim.conf,unistim.conf,chan_unistim,)) @@ -437,5 +447,6 @@ $(eval $(call BuildAsterisk11Module,res-srtp,SRTP,Secure RTP,+libsrtp,,,res_srtp $(eval $(call BuildAsterisk11Module,res-timing-dahdi,DAHDI Timing Interface,,+asterisk11-chan-dahdi,,,res_timing_dahdi,)) $(eval $(call BuildAsterisk11Module,res-timing-pthread,pthread Timing Interface,,,,,res_timing_pthread,)) $(eval $(call BuildAsterisk11Module,res-timing-timerfd,Timerfd Timing Interface,,,,,res_timing_timerfd,)) +$(eval $(call BuildAsterisk11Module,res-xmpp,XMPP client and component module,reference module for interfacting Asterisk directly as a client or component with XMPP server,+libiksemel +libopenssl,/etc/asterisk/xmpp.conf,xmpp.conf,res_xmpp,)) $(eval $(call BuildAsterisk11Module,res-realtime,Realtime Interface,,,,,res_realtime,)) $(eval $(call BuildAsterisk11Module,voicemail,Voicemail,voicemail related modules,+asterisk11-res-adsi +asterisk11-res-smdi,/etc/asterisk/voicemail.conf,voicemail.conf,*voicemail,vm-*)) diff --git a/net/asterisk-13.x/Makefile b/net/asterisk-13.x/Makefile index a01ba95..5c74452 100644 --- a/net/asterisk-13.x/Makefile +++ b/net/asterisk-13.x/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=asterisk13 PKG_VERSION:=13.4.0 -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://downloads.asterisk.org/pub/telephony/asterisk/releases/ @@ -197,7 +197,7 @@ CONFIGURE_ARGS+= \ --without-pwlib \ --without-radius \ $(if $(CONFIG_PACKAGE_$(PKG_NAME)-res-fax-spandsp),--with-spandsp="$(STAGING_DIR)/usr",--without-spandsp) \ - --without-iksemel \ + $(if $(CONFIG_PACKAGE_$(PKG_NAME)-res-xmpp),--with-iksemel="$(STAGING_DIR)/usr",--without-iksemel) \ --without-sdl \ --without-sqlite \ --with-sqlite3="$(STAGING_DIR)/usr" \ -- cgit From 42b2f10cabe8bd696ec46f6a48cb7bd28a45b21f Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sun, 27 Sep 2015 00:13:50 +0200 Subject: libpri: add new package Signed-off-by: Daniel Golle --- libs/libpri/Makefile | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 libs/libpri/Makefile diff --git a/libs/libpri/Makefile b/libs/libpri/Makefile new file mode 100644 index 0000000..079f4fb --- /dev/null +++ b/libs/libpri/Makefile @@ -0,0 +1,54 @@ +# +# Copyright (C) 2015 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:=libpri +PKG_VERSION:=1.4.15 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://downloads.asterisk.org/pub/telephony/libpri/ +PKG_MD5SUM:=206fbcf014ad85bf6613f169ca425e7f +PKG_MAINTAINER:=Daniel Golle + +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk + +define Package/libpri + SECTION:=libs + CATEGORY:=Libraries + TITLE:=libpri Primary Rate ISDN implementation + URL:=http://www.asterisk.org/ + DEPENDS:=+dahdi-tools-libtonezone +endef + +define Package/libpri/description + libpri is a C implementation of the Primary Rate ISDN specification. It was + based on the Bellcore specification SR-NWT-002343 for National ISDN. As of + May 12, 2001, it has been tested work with NI-2, Nortel DMS-100, and + Lucent 5E Custom protocols on switches from Nortel and Lucent. +endef + +define Build/Configure +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpri*.a $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpri*.so* $(1)/usr/lib/ +endef + +define Package/libpri/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpri*.so.* $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,libpri)) -- cgit From a7d042cf84a3e7f9cf80eae5006ee1fa60c58b95 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sun, 27 Sep 2015 00:13:50 +0200 Subject: asterisk-11.x: compile chan_dahdi with support for PRI and BRI Signed-off-by: Daniel Golle --- net/asterisk-11.x/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/net/asterisk-11.x/Makefile b/net/asterisk-11.x/Makefile index fe3e19b..316bd57 100644 --- a/net/asterisk-11.x/Makefile +++ b/net/asterisk-11.x/Makefile @@ -163,10 +163,12 @@ endef ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk11-chan-dahdi),) CONFIGURE_ARGS+= \ --with-dahdi="$(STAGING_DIR)/usr" \ + --with-pri="$(STAGING_DIR)/usr" \ --with-tonezone="$(STAGING_DIR)/usr" else CONFIGURE_ARGS+= \ --without-dahdi \ + --without-pri \ --without-tonezone endif @@ -255,7 +257,6 @@ CONFIGURE_ARGS+= \ --without-ogg \ --without-osptk \ --with-popt="$(STAGING_DIR)/usr" \ - --without-pri \ --without-pwlib \ --without-radius \ --without-sdl \ @@ -416,7 +417,7 @@ $(eval $(call BuildAsterisk11Module,func-uri,URI encoding and decoding,Encodes a $(eval $(call BuildAsterisk11Module,func-vmcount,vmcount dialplan,a vmcount dialplan function,,,,func_vmcount,)) $(eval $(call BuildAsterisk11Module,func-realtime,realtime dialplan,the realtime dialplan function,,,,func_realtime,)) $(eval $(call BuildAsterisk11Module,chan-agent,Agents proxy channel,an implementation of agents proxy channel,,,,chan_agent,)) -$(eval $(call BuildAsterisk11Module,chan-dahdi,DAHDI channel,DAHDI channel support,+dahdi-tools-libtonezone +kmod-dahdi,/etc/asterisk/chan_dahdi.conf,chan_dahdi.conf,chan_dahdi,)) +$(eval $(call BuildAsterisk11Module,chan-dahdi,DAHDI channel,DAHDI channel support,+dahdi-tools-libtonezone +kmod-dahdi +libpri,/etc/asterisk/chan_dahdi.conf,chan_dahdi.conf,chan_dahdi,)) $(eval $(call BuildAsterisk11Module,chan-iax2,IAX2 channel,IAX support,+asterisk11-res-timing-timerfd,/etc/asterisk/iax.conf /etc/asterisk/iaxprov.conf,iax.conf iaxprov.conf,chan_iax2,)) $(eval $(call BuildAsterisk11Module,chan-mgcp,MGCP channel,the channel chan_mgcp,,/etc/asterisk/mgcp.conf,mgcp.conf,chan_mgcp,)) $(eval $(call BuildAsterisk11Module,chan-motif,Jingle channel,Motif Jingle Channel Driver,+asterisk11-res-xmpp,/etc/asterisk/motif.conf /etc/asterisk/jingle.conf,motif.conf jingle.conf,chan_motif,)) -- cgit From 0f95198b03db07c2e867b29ee4d32eb0ad85698e Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Fri, 2 Oct 2015 02:07:44 +0200 Subject: asterisk-1.8.x: add package for chan_dahdi Signed-off-by: Daniel Golle --- net/asterisk-1.8.x/Makefile | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/net/asterisk-1.8.x/Makefile b/net/asterisk-1.8.x/Makefile index 020ab32..26854d0 100644 --- a/net/asterisk-1.8.x/Makefile +++ b/net/asterisk-1.8.x/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=asterisk18 PKG_VERSION:=1.8.32.3 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://downloads.asterisk.org/pub/telephony/asterisk/releases/ @@ -146,6 +146,18 @@ define Package/asterisk18-sounds/install rm -f $(1)/usr/lib/asterisk/sounds/conf-* endef +ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk18-chan-dahdi),) + CONFIGURE_ARGS+= \ + --with-dahdi="$(STAGING_DIR)/usr" \ + --with-pri="$(STAGING_DIR)/usr" \ + --with-tonezone="$(STAGING_DIR)/usr" +else + CONFIGURE_ARGS+= \ + --without-dahdi \ + --without-pri \ + --without-tonezone +endif + ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk18-chan-gtalk),) CONFIGURE_ARGS+= \ --with-iksemel="$(STAGING_DIR)/usr" @@ -212,7 +224,6 @@ CONFIGURE_ARGS+= \ --with-gsm=internal \ --without-bluetooth \ --without-cap \ - --without-dahdi \ --without-gtk2 \ --without-isdnnet \ --without-misdn \ @@ -225,7 +236,6 @@ CONFIGURE_ARGS+= \ --without-ogg \ --without-osptk \ --with-popt="$(STAGING_DIR)/usr" \ - --without-pri \ --without-radius \ --without-sdl \ --without-suppserv \ @@ -295,6 +305,7 @@ $(eval $(call BuildPackage,asterisk18-sounds)) $(eval $(call BuildAsterisk18Module,app-alarmreceiver,Alarm receiver,Central Station Alarm receiver for Ademco Contact ID,,,,app_alarmreceiver,)) $(eval $(call BuildAsterisk18Module,app-authenticate,Authenticate commands,Execute arbitrary authenticate commands,,,,app_authenticate,)) +$(eval $(call BuildAsterisk18Module,app-dahdiras,Execute an ISDN RAS,support for executing an ISDN RAS using DAHDI,+asterisk18-chan-dahdi,,,app_dahdiras,)) $(eval $(call BuildAsterisk18Module,app-directed_pickup,Directed call pickup,support for directed call pickup,,,,app_directed_pickup,)) $(eval $(call BuildAsterisk18Module,app-disa,Direct Inward System Access,Direct Inward System Access,,,,app_disa,)) $(eval $(call BuildAsterisk18Module,app-exec,Exec application,support for application execution,,,,app_exec,)) @@ -321,6 +332,7 @@ $(eval $(call BuildAsterisk18Module,cdr-csv,Provides CDR CSV,Call Detail Record $(eval $(call BuildAsterisk18Module,cdr,Provides CDR,Call Detail Record,,/etc/asterisk/cdr.conf /etc/asterisk/cdr_custom.conf /etc/asterisk/cdr_manager.conf /etc/asterisk/cdr_syslog.conf,cdr cdr_custom cdr_manager cdr_syslog,app_cdr app_forkcdr cdr_custom cdr_manager cdr_syslog func_cdr,)) $(eval $(call BuildAsterisk18Module,codec-a-mu,Alaw to ulaw translation,translation between alaw and ulaw codecs,,,,codec_a_mu,)) $(eval $(call BuildAsterisk18Module,codec-alaw,Signed linear to alaw translation,translation between signed linear and alaw codecs,,,,codec_alaw,)) +$(eval $(call BuildAsterisk18Module,codec-dahdi,DAHDI codec,DAHDI native transcoding support,+asterisk18-chan-dahdi,,,codec_dahdi,)) $(eval $(call BuildAsterisk18Module,codec-g722,G.722,a high bit rate 48/56/64Kbps ITU standard codec,,,,codec_g722,)) $(eval $(call BuildAsterisk18Module,codec-g726,Signed linear to G.726 translation,translation between signed linear and ITU G.726-32kbps codecs,,,,codec_g726,)) $(eval $(call BuildAsterisk18Module,curl,CURL,CURL support,+libcurl,,,func_curl res_curl,)) @@ -345,6 +357,7 @@ $(eval $(call BuildAsterisk18Module,func-shell,Shell,support for shell execution $(eval $(call BuildAsterisk18Module,func-uri,URI encoding and decoding,Encodes and decodes URI-safe strings,,,,func_uri,)) $(eval $(call BuildAsterisk18Module,func-vmcount,vmcount dialplan,a vmcount dialplan function,,,,func_vmcount,)) $(eval $(call BuildAsterisk18Module,chan-agent,Agents proxy channel,An implementation of agents proxy channel,,,,chan_agent,)) +$(eval $(call BuildAsterisk18Module,chan-dahdi,DAHDI channel,DAHDI channel support,+dahdi-tools-libtonezone +kmod-dahdi +libpri,/etc/asterisk/chan_dahdi.conf,chan_dahdi.conf,chan_dahdi,)) $(eval $(call BuildAsterisk18Module,chan-gtalk,GTalk,An implementation of chan_gtalk and res_jabber for GTalk support,+libiksemel,/etc/asterisk/gtalk.conf /etc/asterisk/jabber.conf,gtalk.conf jabber.conf,chan_gtalk res_jabber,)) $(eval $(call BuildAsterisk18Module,chan-iax2,IAX2 channel,An implementation of IAX2 channel,+asterisk18-res-timing-timerfd,/etc/asterisk/iax.conf /etc/asterisk/iaxprov.conf,iax.conf iaxprov.conf,chan_iax2,)) $(eval $(call BuildAsterisk18Module,chan-lantiq,Lantiq TAPI channel,An implementation of Lantiq TAPI channel,@TARGET_lantiq @!TARGET_lantiq_xrx200 +kmod-ltq-vmmc,/etc/asterisk/lantiq.conf,lantiq.conf,chan_lantiq,)) @@ -371,6 +384,7 @@ $(eval $(call BuildAsterisk18Module,res-phoneprov,Phone Provisioning,Phone provi $(eval $(call BuildAsterisk18Module,res-pktccops,Provide PacketCable COPS,simple client/server model for supporting policy control over QoS signaling protocols,,/etc/asterisk/res_pktccops.conf,res_pktccops.conf,res_pktccops,)) $(eval $(call BuildAsterisk18Module,res-smdi,Provide SMDI,Simple Message Desk Interface capability,,/etc/asterisk/smdi.conf,smdi.conf,res_smdi,)) $(eval $(call BuildAsterisk18Module,res-srtp,SRTP,Secure RTP,+libsrtp,,,res_srtp,)) +$(eval $(call BuildAsterisk18Module,res-timing-dahdi,DAHDI Timing Interface,,+asterisk18-chan-dahdi,,,res_timing_dahdi,)) $(eval $(call BuildAsterisk18Module,res-timing-pthread,pthread Timing Interface,,,,,res_timing_pthread,)) $(eval $(call BuildAsterisk18Module,res-timing-timerfd,Timerfd Timing Interface,,,,,res_timing_timerfd,)) $(eval $(call BuildAsterisk18Module,voicemail,Voicemail,voicemail related modules,,/etc/asterisk/voicemail.conf,voicemail.conf,*voicemail res_adsi res_smdi,vm-*)) -- cgit From 84750f2cb8399b7a3408c1ca7766bc97635032ea Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Fri, 2 Oct 2015 02:37:09 +0200 Subject: asterisk-13.x: update to version 13.5.0 Signed-off-by: Daniel Golle --- net/asterisk-13.x/Makefile | 6 +++--- net/asterisk-13.x/patches/004-ifdef-missing-execinfo.patch | 6 ++---- net/asterisk-13.x/patches/030-GNU-GLOB-exts-only-on-glibc.patch | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/net/asterisk-13.x/Makefile b/net/asterisk-13.x/Makefile index 5c74452..c534695 100644 --- a/net/asterisk-13.x/Makefile +++ b/net/asterisk-13.x/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=asterisk13 -PKG_VERSION:=13.4.0 -PKG_RELEASE:=5 +PKG_VERSION:=13.5.0 +PKG_RELEASE:=1 PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://downloads.asterisk.org/pub/telephony/asterisk/releases/ -PKG_MD5SUM:=8cd729d481f0b3d9aadcf5a607c25803 +PKG_MD5SUM:=2fb7d247aacdbb9736c82b133053dfdf PKG_BUILD_DIR=$(BUILD_DIR)/asterisk-$(PKG_VERSION) PKG_BUILD_DEPENDS:=libxml2/host diff --git a/net/asterisk-13.x/patches/004-ifdef-missing-execinfo.patch b/net/asterisk-13.x/patches/004-ifdef-missing-execinfo.patch index 20e5c66..264eb41 100644 --- a/net/asterisk-13.x/patches/004-ifdef-missing-execinfo.patch +++ b/net/asterisk-13.x/patches/004-ifdef-missing-execinfo.patch @@ -1,7 +1,5 @@ -Index: asterisk-13.4.0/include/asterisk/lock.h -=================================================================== ---- asterisk-13.4.0.orig/include/asterisk/lock.h -+++ asterisk-13.4.0/include/asterisk/lock.h +--- a/include/asterisk/lock.h ++++ b/include/asterisk/lock.h @@ -51,9 +51,11 @@ #include #include diff --git a/net/asterisk-13.x/patches/030-GNU-GLOB-exts-only-on-glibc.patch b/net/asterisk-13.x/patches/030-GNU-GLOB-exts-only-on-glibc.patch index bf1ffdf..78447a5 100644 --- a/net/asterisk-13.x/patches/030-GNU-GLOB-exts-only-on-glibc.patch +++ b/net/asterisk-13.x/patches/030-GNU-GLOB-exts-only-on-glibc.patch @@ -11,7 +11,7 @@ glob_ret = glob(fnamebuf, GLOB_NOMAGIC|GLOB_BRACE, NULL, &globbuf); --- a/res/ael/ael_lex.c +++ b/res/ael/ael_lex.c -@@ -1976,7 +1967,7 @@ YY_RULE_SETUP +@@ -1976,7 +1976,7 @@ YY_RULE_SETUP snprintf(fnamebuf2,sizeof(fnamebuf2), "%s/%s", (char *)ast_config_AST_CONFIG_DIR, fnamebuf); ast_copy_string(fnamebuf,fnamebuf2,sizeof(fnamebuf)); } -- cgit From 09540a9b4716ca5f7bc85b6f46fa3d62a79aac26 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Fri, 2 Oct 2015 02:16:02 +0200 Subject: asterisk-13.x: add package for chan_dahdi Signed-off-by: Daniel Golle --- net/asterisk-13.x/Makefile | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/net/asterisk-13.x/Makefile b/net/asterisk-13.x/Makefile index c534695..046b976 100644 --- a/net/asterisk-13.x/Makefile +++ b/net/asterisk-13.x/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=asterisk13 PKG_VERSION:=13.5.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://downloads.asterisk.org/pub/telephony/asterisk/releases/ @@ -162,6 +162,18 @@ define Package/asterisk13-sounds/install rm -f $(1)/usr/lib/asterisk/sounds/conf-* endef +ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk13-chan-dahdi),) + CONFIGURE_ARGS+= \ + --with-dahdi="$(STAGING_DIR)/usr" \ + --with-pri="$(STAGING_DIR)/usr" \ + --with-tonezone="$(STAGING_DIR)/usr" +else + CONFIGURE_ARGS+= \ + --without-dahdi \ + --without-pri \ + --without-tonezone +endif + TARGET_LDFLAGS+= \ $(if $(CONFIG_PACKAGE_$(PKG_NAME)-pbx-lua),-ldl -lcrypt) @@ -174,7 +186,6 @@ CONFIGURE_ARGS+= \ --without-cap \ $(if $(CONFIG_PACKAGE_$(PKG_NAME)-curl),--with-libcurl="$(STAGING_DIR)/usr",--without-curl) \ --without-curses \ - --without-dahdi \ --with-gsm=internal \ --without-gtk2 \ --with-ilbc=internal \ @@ -193,7 +204,6 @@ CONFIGURE_ARGS+= \ $(if $(CONFIG_PACKAGE_$(PKG_NAME)-pgsql),--with-postgres="$(STAGING_DIR)/usr",--without-postgres) \ $(if $(CONFIG_PACKAGE_$(PKG_NAME)-pjsip),--with-pjproject,--without-pjproject) \ --with-popt="$(STAGING_DIR)/usr" \ - --without-pri \ --without-pwlib \ --without-radius \ $(if $(CONFIG_PACKAGE_$(PKG_NAME)-res-fax-spandsp),--with-spandsp="$(STAGING_DIR)/usr",--without-spandsp) \ @@ -206,7 +216,6 @@ CONFIGURE_ARGS+= \ --without-tds \ --without-termcap \ --without-tinfo \ - --without-tonezone \ --with-uuid="$(STAGING_DIR)/usr" \ --without-vorbis \ --without-vpb \ @@ -288,6 +297,7 @@ $(eval $(call BuildAsterisk13Module,app-authenticate,Authenticate commands,Execu $(eval $(call BuildAsterisk13Module,app-chanisavail,Channel availability check,support for checking if a channel is available,,,app_chanisavail,,)) $(eval $(call BuildAsterisk13Module,app-chanspy,Channel listen in,support for listening in on any channel,,,app_chanspy,,)) $(eval $(call BuildAsterisk13Module,app-confbridge,ConfBridge,Software bridge for multi-party audio conferencing,+asterisk13-bridge-builtin-features +asterisk13-bridge-simple +asterisk13-bridge-softmix,confbridge.conf,app_confbridge,,)) +$(eval $(call BuildAsterisk13Module,app-dahdiras,Execute an ISDN RAS,support for executing an ISDN RAS using DAHDI,+asterisk13-chan-dahdi,,app_dahdiras,,)) $(eval $(call BuildAsterisk13Module,app-directed_pickup,Directed call pickup,support for directed call pickup,,,app_directed_pickup,,)) $(eval $(call BuildAsterisk13Module,app-disa,Direct Inward System Access,Direct Inward System Access,,,app_disa,,)) $(eval $(call BuildAsterisk13Module,app-exec,Exec application,support for application execution,,,app_exec,,)) @@ -316,6 +326,7 @@ $(eval $(call BuildAsterisk13Module,bridge-softmix,Multi-party software based ch $(eval $(call BuildAsterisk13Module,cdr,Provides CDR,Call Detail Record,,cdr.conf cdr_custom.conf cdr_manager.conf cdr_syslog.conf,app_cdr app_forkcdr cdr_custom cdr_manager cdr_syslog func_cdr,,)) $(eval $(call BuildAsterisk13Module,cdr-csv,Provides CDR CSV,Call Detail Record with CSV support,,,cdr_csv,,)) $(eval $(call BuildAsterisk13Module,cdr-sqlite3,Provides CDR SQLITE3,Call Detail Record with SQLITE3 support,libsqlite3,,cdr_sqlite3_custom,,)) +$(eval $(call BuildAsterisk13Module,chan-dahdi,DAHDI channel,DAHDI channel support,+dahdi-tools-libtonezone +kmod-dahdi +libpri,chan_dahdi.conf,chan_dahdi,,)) $(eval $(call BuildAsterisk13Module,chan-iax2,IAX2 channel,IAX support,+asterisk13-res-timing-timerfd,iax.conf iaxprov.conf,chan_iax2,,)) $(eval $(call BuildAsterisk13Module,chan-sip,SIP channel,the channel chan_sip,+asterisk13-app-confbridge,sip.conf sip_notify.conf,chan_sip,,)) $(eval $(call BuildAsterisk13Module,chan-skinny,Skinny channel,the channel chan_skinny,,skinny.conf,chan_skinny,,)) @@ -323,6 +334,7 @@ $(eval $(call BuildAsterisk13Module,chan-unistim,Unistim channel,channel driver $(eval $(call BuildAsterisk13Module,codec-a-mu,Alaw to ulaw translation,translation between alaw and ulaw codecs,,,codec_a_mu,,)) $(eval $(call BuildAsterisk13Module,codec-adpcm,ADPCM text,ADPCM text ,,,codec_adpcm,,)) $(eval $(call BuildAsterisk13Module,codec-alaw,Signed linear to alaw translation,translation between signed linear and alaw codecs,,,codec_alaw,,)) +$(eval $(call BuildAsterisk13Module,codec-dahdi,DAHDI codec,DAHDI native transcoding support,+asterisk13-chan-dahdi,,codec_dahdi,,)) $(eval $(call BuildAsterisk13Module,codec-g722,G.722,a high bit rate 48/56/64Kbps ITU standard codec,,,codec_g722,,)) $(eval $(call BuildAsterisk13Module,codec-g726,Signed linear to G.726 translation,translation between signed linear and ITU G.726-32kbps codecs,,,codec_g726,,)) $(eval $(call BuildAsterisk13Module,codec-gsm,linear to GSM translation,translate between signed linear and GSM,,,codec_gsm,,)) @@ -383,6 +395,7 @@ $(eval $(call BuildAsterisk13Module,res-rtp-multicast,RTP multicast engine,,,,re $(eval $(call BuildAsterisk13Module,res-smdi,Provide SMDI,Simple Message Desk Interface capability,,smdi.conf,res_smdi,,)) $(eval $(call BuildAsterisk13Module,res-sorcery,Sorcery data layer,,,,res_sorcery_astdb res_sorcery_config res_sorcery_memory res_sorcery_realtime,,)) $(eval $(call BuildAsterisk13Module,res-srtp,SRTP Support,Secure RTP connection,+libsrtp,,res_srtp,,)) +$(eval $(call BuildAsterisk13Module,res-timing-dahdi,DAHDI Timing Interface,,+asterisk13-chan-dahdi,,res_timing_dahdi,,)) $(eval $(call BuildAsterisk13Module,res-timing-pthread,pthread Timing Interface,,,,res_timing_pthread,,)) $(eval $(call BuildAsterisk13Module,res-timing-timerfd,Timerfd Timing Interface,,,,res_timing_timerfd,,)) $(eval $(call BuildAsterisk13Module,voicemail,Voicemail,voicemail related modules,+asterisk13-res-adsi +asterisk13-res-smdi,voicemail.conf,app_voicemail res_adsi res_smdi,vm-*,)) -- cgit From 426b108b31f8246c2b4f8dec17c2d7dbe497435f Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Fri, 2 Oct 2015 03:19:59 +0200 Subject: asterisk-13.x: don't install duplicate files Fixes #89 Signed-off-by: Daniel Golle --- net/asterisk-13.x/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/asterisk-13.x/Makefile b/net/asterisk-13.x/Makefile index 046b976..829ac25 100644 --- a/net/asterisk-13.x/Makefile +++ b/net/asterisk-13.x/Makefile @@ -398,4 +398,4 @@ $(eval $(call BuildAsterisk13Module,res-srtp,SRTP Support,Secure RTP connection, $(eval $(call BuildAsterisk13Module,res-timing-dahdi,DAHDI Timing Interface,,+asterisk13-chan-dahdi,,res_timing_dahdi,,)) $(eval $(call BuildAsterisk13Module,res-timing-pthread,pthread Timing Interface,,,,res_timing_pthread,,)) $(eval $(call BuildAsterisk13Module,res-timing-timerfd,Timerfd Timing Interface,,,,res_timing_timerfd,,)) -$(eval $(call BuildAsterisk13Module,voicemail,Voicemail,voicemail related modules,+asterisk13-res-adsi +asterisk13-res-smdi,voicemail.conf,app_voicemail res_adsi res_smdi,vm-*,)) +$(eval $(call BuildAsterisk13Module,voicemail,Voicemail,voicemail related modules,+asterisk13-res-adsi +asterisk13-res-smdi,voicemail.conf,app_voicemail,vm-*,)) -- cgit From cb751699aabc61f2cee465e006f72eea5c006461 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Fri, 2 Oct 2015 03:21:31 +0200 Subject: asterisk-13.x: keep conf-* sounds conf-* sounds are not package anywhere else, thus keep them in asterisk13-sounds. Fixes #90 Signed-off-by: Daniel Golle --- net/asterisk-13.x/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/net/asterisk-13.x/Makefile b/net/asterisk-13.x/Makefile index 829ac25..bfa8c5e 100644 --- a/net/asterisk-13.x/Makefile +++ b/net/asterisk-13.x/Makefile @@ -159,7 +159,6 @@ define Package/asterisk13-sounds/install $(INSTALL_DIR) $(1)/usr/lib/asterisk/sounds/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/asterisk/sounds/en/* $(1)/usr/lib/asterisk/sounds/ rm -f $(1)/usr/lib/asterisk/sounds/vm-* - rm -f $(1)/usr/lib/asterisk/sounds/conf-* endef ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk13-chan-dahdi),) -- cgit From 3542104099235cf1ef2ccfb9c516509915d42bdd Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Fri, 9 Oct 2015 02:20:33 +0200 Subject: chan-sccp-b: conflicts with asterisk*-chan-skinny Signed-off-by: Daniel Golle --- net/chan-sccp-b/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/chan-sccp-b/Makefile b/net/chan-sccp-b/Makefile index 0dbfb52..4485625 100644 --- a/net/chan-sccp-b/Makefile +++ b/net/chan-sccp-b/Makefile @@ -40,18 +40,21 @@ define Package/asterisk18-chan-sccp-b $(call Package/chan-sccp-b/Default) DEPENDS+= asterisk18 VARIANT:=asterisk18 + CONFLICTS:=asterisk18-chan-skinny endef define Package/asterisk13-chan-sccp-b $(call Package/chan-sccp-b/Default) DEPENDS+= asterisk13 VARIANT:=asterisk13 + CONFLICTS:=asterisk13-chan-skinny endef define Package/asterisk11-chan-sccp-b $(call Package/chan-sccp-b/Default) DEPENDS+= asterisk11 VARIANT:=asterisk11 + CONFLICTS:=asterisk11-chan-skinny endef define Package/description/Default -- cgit From e26c828073c2b88a772ec468daafdf32a4708cdf Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sun, 11 Oct 2015 10:59:28 +0200 Subject: net/asterisk: Update asterisk-11.x to 11.20.0 Signed-off-by: Sebastian Kemper [daniel@makrotopia.org: split patch, one for each version] --- net/asterisk-11.x/Makefile | 6 +++--- .../patches/010-asterisk-configure-undef-res-ninit.patch | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net/asterisk-11.x/Makefile b/net/asterisk-11.x/Makefile index 316bd57..72d7905 100644 --- a/net/asterisk-11.x/Makefile +++ b/net/asterisk-11.x/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=asterisk11 -PKG_VERSION:=11.19.0 -PKG_RELEASE:=2 +PKG_VERSION:=11.20.0 +PKG_RELEASE:=1 PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://downloads.asterisk.org/pub/telephony/asterisk/releases/ -PKG_MD5SUM:=f10259509aeda1e9f47dd57e5cc23680 +PKG_MD5SUM:=d15759b05862250073e2708394ad2f4c PKG_BUILD_DIR=$(BUILD_DIR)/asterisk-$(PKG_VERSION) PKG_BUILD_DEPENDS:=libxml2/host diff --git a/net/asterisk-11.x/patches/010-asterisk-configure-undef-res-ninit.patch b/net/asterisk-11.x/patches/010-asterisk-configure-undef-res-ninit.patch index 6ed9d07..b8a6337 100644 --- a/net/asterisk-11.x/patches/010-asterisk-configure-undef-res-ninit.patch +++ b/net/asterisk-11.x/patches/010-asterisk-configure-undef-res-ninit.patch @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -1110,7 +1110,6 @@ AC_LINK_IFELSE( +@@ -1111,7 +1111,6 @@ AC_LINK_IFELSE( #include ], [int foo = res_ninit(NULL);])], AC_MSG_RESULT(yes) -- cgit From 98a8bea6a9e26c7660ee77af42e022567a0204a9 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sun, 11 Oct 2015 10:59:28 +0200 Subject: net/asterisk: Update asterisk-13.x to 13.6.0 Signed-off-by: Sebastian Kemper [daniel@makrotopia.org: split patch, one for each version] --- net/asterisk-13.x/Makefile | 6 +++--- net/asterisk-13.x/patches/001-disable-semaphores-check.patch | 2 +- net/asterisk-13.x/patches/002-undef-res-ninit.patch | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/net/asterisk-13.x/Makefile b/net/asterisk-13.x/Makefile index bfa8c5e..05a3583 100644 --- a/net/asterisk-13.x/Makefile +++ b/net/asterisk-13.x/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=asterisk13 -PKG_VERSION:=13.5.0 -PKG_RELEASE:=2 +PKG_VERSION:=13.6.0 +PKG_RELEASE:=1 PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://downloads.asterisk.org/pub/telephony/asterisk/releases/ -PKG_MD5SUM:=2fb7d247aacdbb9736c82b133053dfdf +PKG_MD5SUM:=66355aec4336c068f25e7df739786e72 PKG_BUILD_DIR=$(BUILD_DIR)/asterisk-$(PKG_VERSION) PKG_BUILD_DEPENDS:=libxml2/host diff --git a/net/asterisk-13.x/patches/001-disable-semaphores-check.patch b/net/asterisk-13.x/patches/001-disable-semaphores-check.patch index df38c43..f946b56 100644 --- a/net/asterisk-13.x/patches/001-disable-semaphores-check.patch +++ b/net/asterisk-13.x/patches/001-disable-semaphores-check.patch @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -899,19 +899,6 @@ AC_LINK_IFELSE( +@@ -900,19 +900,6 @@ AC_LINK_IFELSE( ] ) diff --git a/net/asterisk-13.x/patches/002-undef-res-ninit.patch b/net/asterisk-13.x/patches/002-undef-res-ninit.patch index e6b82c3..42b4cbc 100644 --- a/net/asterisk-13.x/patches/002-undef-res-ninit.patch +++ b/net/asterisk-13.x/patches/002-undef-res-ninit.patch @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -1169,7 +1169,6 @@ AC_LINK_IFELSE( +@@ -1170,7 +1170,6 @@ AC_LINK_IFELSE( #include ], [int foo = res_ninit(NULL);])], AC_MSG_RESULT(yes) -- cgit