pjproject_bundled: raise timeout value used when downloading

After configuring Asterisk with '--with-pjproject-bundled' the configure/build
process attempts to download pjproject from its download site. Currently, a
timeout of 10 seconds is used that will stop the download process if pjproject
has not been fully downloaded in that time. For some systems this was not enough
time and the process was timing out too early.

This patch raises the download timeout value to '60'. Also, this patch fixes
another bug where the DOWNLOAD_TIMEOUT variable was not being properly exported
due to a naming error. DOWNLOAD_MAX_TIMEOUT is now properly renamed to
DOWNLOAD_TIMEOUT.

ASTERISK-26814 #close

Change-Id: Ia56e4e8a3d39db76bc8a1852b2cf07ec10b39842

diff --git a/makeopts.in b/makeopts.in
index cf2f79007e7a83808b386e24d4e1f830b8217fda..5f9188fc1c79145edb9691cb9e596581bd869ef1 100644 (file)
--- a/makeopts.in
+++ b/makeopts.in
@@ -28,7 +28,7 @@ WGET=@WGET@
 FETCH=@FETCH@
 DOWNLOAD=@DOWNLOAD@
 DOWNLOAD_TO_STDOUT=@DOWNLOAD_TO_STDOUT@
-DOWNLOAD_MAX_TIMEOUT=@DOWNLOAD_MAX_TIMEOUT@
+DOWNLOAD_TIMEOUT=@DOWNLOAD_TIMEOUT@
 SOUNDS_CACHE_DIR=@SOUNDS_CACHE_DIR@
 EXTERNALS_CACHE_DIR=@EXTERNALS_CACHE_DIR@
 RUBBER=@RUBBER@

diff --git a/third-party/pjproject/Makefile b/third-party/pjproject/Makefile
index 99c22fa8be67e753ba0ef3994605ed6777c95149..e691f22428d6f6255ecae84282810e3cd9fae1b5 100644 (file)
--- a/third-party/pjproject/Makefile
+++ b/third-party/pjproject/Makefile
@@ -96,9 +96,9 @@ endef
 
 define download_from_pjproject
        ($(SHELL_ECHO_PREFIX) Downloading $(TARBALL_URL) to $(TARBALL) ;\
-       $(DOWNLOAD_TO_STDOUT) $(call DOWNLOAD_TIMEOUT,5,10) $(TARBALL_URL) > $(TARBALL) &&\
+       $(DOWNLOAD_TO_STDOUT) $(call DOWNLOAD_TIMEOUT,5,60) $(TARBALL_URL) > $(TARBALL) &&\
        $(SHELL_ECHO_PREFIX) Downloading $(PJPROJECT_URL)/MD5SUM to $(PJMD5SUM) &&\
-       $(DOWNLOAD_TO_STDOUT) $(call DOWNLOAD_TIMEOUT,5,10) $(PJPROJECT_URL)/MD5SUM.TXT > $(PJMD5SUM) &&\
+       $(DOWNLOAD_TO_STDOUT) $(call DOWNLOAD_TIMEOUT,5,60) $(PJPROJECT_URL)/MD5SUM.TXT > $(PJMD5SUM) &&\
        $(verify_tarball))
 endef