<p>Jenkins2 <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/6233">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  George Joseph: Looks good to me, but someone else must approve
  Joshua Colp: Looks good to me, approved
  Jenkins2: Approved for Submit

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">configure: Check cache for valid pjproject tarball before downloading.<br><br>On a fresh Asterisk source directory, the bundled pjproject tarball is<br>unconditionally downloaded even if the tarball is already in a specified<br>cache directory.<br><br>* Made check if the pjproject tarball is valid in the cache directory<br>before downloading the tarball on a fresh source directory.<br><br>Change-Id: Ic7ec842d3c97ecd8dafbad6f056b7fdbce41cae5<br>---<br>M third-party/pjproject/Makefile<br>1 file changed, 8 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/third-party/pjproject/Makefile b/third-party/pjproject/Makefile<br>index a5b5508..7a42edc 100644<br>--- a/third-party/pjproject/Makefile<br>+++ b/third-party/pjproject/Makefile<br>@@ -86,6 +86,11 @@<br> <br> _all: $(TARGETS)<br> <br>+define tarball_exists<br>+       (if [ -f $(TARBALL) -a -f $(PJMD5SUM) ] ; then exit 0 ;\<br>+     else exit 1; fi; )<br>+endef<br>+<br> define verify_tarball<br>         ($(SHELL_ECHO_PREFIX) Verifying $(TARBALL) &&\<br>        tarball_sum=$$($(CAT) $(TARBALL) | $(MD5) | $(SED) -n -r -e "s/^([^ ]+)\s+.*/\1/gp") ;\<br>@@ -111,11 +116,12 @@<br> PJMD5SUM = $(patsubst %.tar.bz2,%.md5,$(TARBALL))<br> <br> $(TARBALL): ../versions.mak<br>-        $(CMD_PREFIX) $(download_from_pjproject) || (rm -rf $@ ;\<br>+    $(CMD_PREFIX) ($(tarball_exists) && $(verify_tarball) && touch $@) || (rm -rf $@ ;\<br>+  $(download_from_pjproject)) || (rm -rf $@ ;\<br>  $(SHELL_ECHO_PREFIX) Retrying download ; $(download_from_pjproject))<br> <br> source/.unpacked: $(DOWNLOAD_DIR)/pjproject-$(PJPROJECT_VERSION).tar.bz2<br>-   ($(verify_tarball)) || (rm -rf $@ ;\<br>+ $(CMD_PREFIX) $(verify_tarball) || (rm -rf $@ ;\<br>      $(SHELL_ECHO_PREFIX) Retrying download ; $(download_from_pjproject))<br>  $(ECHO_PREFIX) Unpacking $<<br>        -@rm -rf source pjproject-* >/dev/null 2>&1<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/6233">change 6233</a>. To unsubscribe, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/6233"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 14 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ic7ec842d3c97ecd8dafbad6f056b7fdbce41cae5 </div>
<div style="display:none"> Gerrit-Change-Number: 6233 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Richard Mudgett <rmudgett@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>