From ec6991c01cf141db172bd5bc30a3e18cb9174208 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Thu, 3 Aug 2017 21:15:59 +0200 Subject: [PATCH 1/3] asterisk-11.x and asterisk-13.x: Disable LOW_MEMORY by default In issue #173 a segmentation fault occuring during a simple SIP call was reported. Compiling with LOW_MEMORY disabled the reproducible segfault disappeared. This commits adds a switch for LOW_MEMORY. Default is off. If anybody wants to debug the segfault s/he can enable it. The segfault was reported for Asterisk 11. Disable LOW_MEMORY on Asterisk 13 anyway, better safe than sorry. Signed-off-by: Sebastian Kemper --- net/asterisk-11.x/Config.in | 11 +++++++++++ net/asterisk-11.x/Makefile | 6 +++++- net/asterisk-13.x/Config.in | 11 +++++++++++ net/asterisk-13.x/Makefile | 6 +++++- 4 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 net/asterisk-11.x/Config.in create mode 100644 net/asterisk-13.x/Config.in diff --git a/net/asterisk-11.x/Config.in b/net/asterisk-11.x/Config.in new file mode 100644 index 0000000..38e2c47 --- /dev/null +++ b/net/asterisk-11.x/Config.in @@ -0,0 +1,11 @@ +menu "Advanced configuration" + depends on PACKAGE_asterisk11 + +config ASTERISK11_LOW_MEMORY + bool "Optimize Asterisk 11 for low memory usage" + default n + help + Warning: this feature is known to cause problems with some modules. + Disable it if you experience problems like segmentation faults. + +endmenu diff --git a/net/asterisk-11.x/Makefile b/net/asterisk-11.x/Makefile index e9349cd..395c7b0 100644 --- a/net/asterisk-11.x/Makefile +++ b/net/asterisk-11.x/Makefile @@ -51,6 +51,10 @@ define Package/asterisk11/install/sounds $(CP) $(PKG_INSTALL_DIR)/usr/lib/asterisk/sounds/en/$(2) $(1)/usr/lib/asterisk/sounds/ endef +define Package/$(PKG_NAME)/config + source "$(SOURCE)/Config.in" +endef + define BuildAsterisk11Module define Package/asterisk11-$(1) $$(call Package/asterisk11/Default) @@ -327,7 +331,7 @@ define Build/Compile cd "$(PKG_BUILD_DIR)" && \ ./menuselect/menuselect \ --disable BUILD_NATIVE \ - --enable LOW_MEMORY \ + $(if $(CONFIG_ASTERISK11_LOW_MEMORY),--enable LOW_MEMORY) \ menuselect.makeopts $(MAKE) -C "$(PKG_BUILD_DIR)" include/asterisk/version.h \ include/asterisk/buildopts.h defaults.h \ diff --git a/net/asterisk-13.x/Config.in b/net/asterisk-13.x/Config.in new file mode 100644 index 0000000..fd38585 --- /dev/null +++ b/net/asterisk-13.x/Config.in @@ -0,0 +1,11 @@ +menu "Advanced configuration" + depends on PACKAGE_asterisk13 + +config ASTERISK13_LOW_MEMORY + bool "Optimize Asterisk 13 for low memory usage" + default n + help + Warning: this feature is known to cause problems with some modules. + Disable it if you experience problems like segmentation faults. + +endmenu diff --git a/net/asterisk-13.x/Makefile b/net/asterisk-13.x/Makefile index e0bb479..f7b59f3 100644 --- a/net/asterisk-13.x/Makefile +++ b/net/asterisk-13.x/Makefile @@ -52,6 +52,10 @@ define Package/asterisk13/install/sounds $(CP) $(PKG_INSTALL_DIR)/usr/lib/asterisk/sounds/en/$(2) $(1)/usr/lib/asterisk/sounds/ endef +define Package/$(PKG_NAME)/config + source "$(SOURCE)/Config.in" +endef + define BuildAsterisk13Module define Package/asterisk13-$(1) $$(call Package/asterisk13/Default) @@ -269,7 +273,7 @@ define Build/Compile cd "$(PKG_BUILD_DIR)" && \ ./menuselect/menuselect \ --disable BUILD_NATIVE \ - --enable LOW_MEMORY \ + $(if $(CONFIG_ASTERISK13_LOW_MEMORY),--enable LOW_MEMORY) \ menuselect.makeopts $(MAKE) -C "$(PKG_BUILD_DIR)" \ include/asterisk/version.h \ From ecaccf66573ca92eceb907c9b4e98a72e8056acd Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Thu, 3 Aug 2017 21:26:23 +0200 Subject: [PATCH 2/3] freeswitch-stable-sounds: add "Allison" sound packs These were recently added by upstream. Signed-off-by: Sebastian Kemper --- net/freeswitch-stable-sounds/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net/freeswitch-stable-sounds/Makefile b/net/freeswitch-stable-sounds/Makefile index 91d6be2..d1605f1 100644 --- a/net/freeswitch-stable-sounds/Makefile +++ b/net/freeswitch-stable-sounds/Makefile @@ -86,6 +86,10 @@ $(eval $(call Package/$(PKG_NAME)/Sounds,en-ca-june-8000,Sound prompts,June,en-C $(eval $(call Package/$(PKG_NAME)/Sounds,en-ca-june-16000,Sound prompts,June,en-CA,16,1.0.51,8d0091a2c98e5e06afea6bdd9f6cf2942e937786016037207b85757218b0f7a7)) $(eval $(call Package/$(PKG_NAME)/Sounds,en-ca-june-32000,Sound prompts,June,en-CA,32,1.0.51,8720b363995724792ff4723e1c8218ef95b27cb36208b7258f93bdda72123387)) $(eval $(call Package/$(PKG_NAME)/Sounds,en-ca-june-48000,Sound prompts,June,en-CA,48,1.0.51,d2fce478a95b8d9500a544a00253c81d7e9f639e21980bd689910fac87f30871)) +$(eval $(call Package/$(PKG_NAME)/Sounds,en-us-allison-8000,Sound prompts,Allison,en-US,8,1.0.0,fa3601a6a2e2eaceaefa0aafb812ece3494dcd81a9eb94160e4aea51dbb2dde0)) +$(eval $(call Package/$(PKG_NAME)/Sounds,en-us-allison-16000,Sound prompts,Allison,en-US,16,1.0.0,833f7012098cf90527eea4bcc1f713431327c04b51802c3d622d145630183a5e)) +$(eval $(call Package/$(PKG_NAME)/Sounds,en-us-allison-32000,Sound prompts,Allison,en-US,32,1.0.0,2685af0413f25daf0b5199dc6f1257ce8d3d82deb8f56541781bde3ca36223a1)) +$(eval $(call Package/$(PKG_NAME)/Sounds,en-us-allison-48000,Sound prompts,Allison,en-US,48,1.0.0,621668f0d03970ff5ffbd446cebcec7a797fab1a5146169f6bda268d10e5d328)) $(eval $(call Package/$(PKG_NAME)/Sounds,en-us-callie-8000,Sound prompts,Callie,en-US,8,1.0.51,e48a63bd69e6253d294ce43a941d603b02467feb5d92ee57a536ccc5f849a4a8)) $(eval $(call Package/$(PKG_NAME)/Sounds,en-us-callie-16000,Sound prompts,Callie,en-US,16,1.0.51,324b1ab5ab754db5697963e9bf6a2f9c7aeb1463755e86bbb6dc4d6a77329da2)) $(eval $(call Package/$(PKG_NAME)/Sounds,en-us-callie-32000,Sound prompts,Callie,en-US,32,1.0.51,06fd6b8aec937556bf5303ab19a212c60daf00546d395cf269dfe324ac9c6838)) From 23e60f5cdfe76ccb011f3d16877f5df7d6bb9a87 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Thu, 3 Aug 2017 21:31:15 +0200 Subject: [PATCH 3/3] freeswitch-stable: cleanups - Replace $FS_STABLE_PREFIX_DIR with $FS_STABLE_DATA_DIR. The variable is set to /usr/share/freeswitch, so it's not the prefix. Data dir is the correct description. - Remove lots of lines from CONFIGURE_ARGS. All of them duplicates, because they're already set by the build system, so we can remove the clutter. Signed-off-by: Sebastian Kemper --- net/freeswitch-stable/Makefile | 41 ++++++++++------------------------ 1 file changed, 12 insertions(+), 29 deletions(-) diff --git a/net/freeswitch-stable/Makefile b/net/freeswitch-stable/Makefile index 5601ebf..b5d03d2 100644 --- a/net/freeswitch-stable/Makefile +++ b/net/freeswitch-stable/Makefile @@ -53,24 +53,24 @@ PKG_LICENSE:= \ PKG_LICENSE_FILES:=debian/copyright -FS_STABLE_PREFIX_DIR:=/usr/share/$(PRG_NAME) +FS_STABLE_DATA_DIR:=/usr/share/$(PRG_NAME) FS_STABLE_BIN_DIR:=/usr/bin -FS_STABLE_EXAMPLES_DIR:=$(FS_STABLE_PREFIX_DIR)/examples -FS_STABLE_FONTS_DIR:=$(FS_STABLE_PREFIX_DIR)/fonts -FS_STABLE_GRAMMAR_DIR:=$(FS_STABLE_PREFIX_DIR)/grammar -FS_STABLE_HTDOCS_DIR:=$(FS_STABLE_PREFIX_DIR)/htdocs -FS_STABLE_IMAGES_DIR:=$(FS_STABLE_PREFIX_DIR)/images +FS_STABLE_EXAMPLES_DIR:=$(FS_STABLE_DATA_DIR)/examples +FS_STABLE_FONTS_DIR:=$(FS_STABLE_DATA_DIR)/fonts +FS_STABLE_GRAMMAR_DIR:=$(FS_STABLE_DATA_DIR)/grammar +FS_STABLE_HTDOCS_DIR:=$(FS_STABLE_DATA_DIR)/htdocs +FS_STABLE_IMAGES_DIR:=$(FS_STABLE_DATA_DIR)/images FS_STABLE_INCLUDES_DIR:=/usr/include/$(PRG_NAME) -FS_STABLE_LANG_DIR:=$(FS_STABLE_PREFIX_DIR)/lang +FS_STABLE_LANG_DIR:=$(FS_STABLE_DATA_DIR)/lang FS_STABLE_LIB_DIR:=/usr/lib FS_STABLE_MOD_DIR:=$(FS_STABLE_LIB_DIR)/$(PRG_NAME)/mod FS_STABLE_PKGCONFIG_DIR:=$(FS_STABLE_LIB_DIR)/pkgconfig -FS_STABLE_SCRIPTS_DIR:=$(FS_STABLE_PREFIX_DIR)/scripts -FS_STABLE_SOUNDS_DIR:=$(FS_STABLE_PREFIX_DIR)/sounds +FS_STABLE_SCRIPTS_DIR:=$(FS_STABLE_DATA_DIR)/scripts +FS_STABLE_SOUNDS_DIR:=$(FS_STABLE_DATA_DIR)/sounds FS_STABLE_SYSCONF_DIR:=/etc FS_STABLE_TLS_DIR:=$(FS_STABLE_SYSCONF_DIR)/$(PRG_NAME)/tls -FS_STABLE_TZ_DIR:=$(FS_STABLE_PREFIX_DIR)/tz +FS_STABLE_TZ_DIR:=$(FS_STABLE_DATA_DIR)/tz # Maintain a list of all non-module packages so they can be added to # PKG_CONFIG_DEPENDS. @@ -574,10 +574,10 @@ endif ifeq ($(1),perl) $(INSTALL_DIR) $$(1)$(PERL_SITELIB)/auto/$(PRG_NAME) $(INSTALL_BIN) \ - $(PKG_INSTALL_DIR)$(FS_STABLE_PREFIX_DIR)/perl/$(PRG_NAME).so \ + $(PKG_INSTALL_DIR)/usr/perl/$(PRG_NAME).so \ $$(1)$(PERL_SITELIB)/auto/$(PRG_NAME) $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)$(FS_STABLE_PREFIX_DIR)/perl/$(PRG_NAME).pm \ + $(PKG_INSTALL_DIR)/usr/perl/$(PRG_NAME).pm \ $$(1)$(PERL_SITELIB) endif ifeq ($(1),python) @@ -630,33 +630,16 @@ $$(eval $$(call BuildPackage,$(PKG_NAME)-util-$(1))) endef CONFIGURE_ARGS+= \ - --build=$(GNU_HOST_NAME) \ - --host=$(GNU_TARGET_NAME) \ - --target=$(GNU_TARGET_NAME) \ - --prefix=$(FS_STABLE_PREFIX_DIR) \ - --bindir=$(FS_STABLE_BIN_DIR) \ - --includedir=$(FS_STABLE_INCLUDES_DIR) \ - --libdir=$(FS_STABLE_LIB_DIR) \ --srcdir=$(PKG_BUILD_DIR) \ - --sysconfdir=$(FS_STABLE_SYSCONF_DIR) \ --disable-dependency-tracking \ --disable-static \ --disable-system-xmlrpc-c \ --enable-fhs \ --with-cachedir=/tmp/$(PRG_NAME)/cache \ - --with-certsdir=$(FS_STABLE_TLS_DIR) \ --with-dbdir=/tmp/$(PRG_NAME)/db \ - --with-fontsdir=$(FS_STABLE_FONTS_DIR) \ - --with-grammardir=$(FS_STABLE_GRAMMAR_DIR) \ - --with-htdocsdir=$(FS_STABLE_HTDOCS_DIR) \ --with-imagesdir=$(FS_STABLE_IMAGES_DIR) \ --with-logfiledir=/tmp/$(PRG_NAME)/log \ - --with-modinstdir=$(FS_STABLE_MOD_DIR) \ - --with-pkgconfigdir=$(FS_STABLE_PKGCONFIG_DIR) \ --with-recordingsdir=/tmp/$(PRG_NAME)/recordings \ - --with-rundir=/var/run/$(PRG_NAME) \ - --with-scriptdir=$(FS_STABLE_SCRIPTS_DIR) \ - --with-soundsdir=$(FS_STABLE_SOUNDS_DIR) \ --with-storagedir=/tmp/$(PRG_NAME)/storage \ $(call autoconf_bool,CONFIG_FS_STABLE_WITH_LIBEDIT,core-libedit-support) \ $(call autoconf_bool,CONFIG_FS_STABLE_WITH_ODBC,core-odbc-support) \