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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">install_prereq: Checkout of libSRTP 2.x.<br><br>Since Asterisk 13.17, libSRTP 2.x is supported. Therefore, its latest version<br>is installed again via the script install_prereq.<br><br>ASTERISK-27356<br><br>Change-Id: I13125839a79052356469e41edacbebff0a937d39<br>---<br>M contrib/scripts/install_prereq<br>1 file changed, 10 insertions(+), 14 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/contrib/scripts/install_prereq b/contrib/scripts/install_prereq<br>index d69f552..c4b91f6 100755<br>--- a/contrib/scripts/install_prereq<br>+++ b/contrib/scripts/install_prereq<br>@@ -165,22 +165,18 @@<br>                /sbin/ldconfig<br>        fi<br> <br>-        # Only install libsrtp if it wasn't installed via package<br>+        # Only install libsrtp2 if it wasn't installed via package<br>        if ! test -f /usr/include/srtp/srtp.h; then<br>-          echo "*** Installing libsrtp ***"<br>-          if [ ! -d libsrtp ]; then<br>-                    git clone https://github.com/cisco/libsrtp.git<br>-                       cd libsrtp<br>-           else<br>-                 cd libsrtp<br>-                   git pull<br>+             if ! test -f /usr/include/srtp2/srtp.h; then<br>+                 echo "*** Installing libsrtp2 ***"<br>+                 wget -O - http://github.com/cisco/libsrtp/archive/v2.tar.gz | zcat | tar -xf -<br>+                       cd libsrtp-2<br>+                 ./configure --enable-openssl<br>+                 make shared_library uninstall install<br>+                        cd ..<br>+                        echo "/usr/local/lib" > /etc/ld.so.conf.d/usr_local.conf<br>+                        /sbin/ldconfig<br>                fi<br>-           git checkout "1_5_x_throttle"<br>-              ./configure --disable-debug --disable-stdout --enable-openssl<br>-                make shared_library uninstall install<br>-                cd ..<br>-                echo "/usr/local/lib" > /etc/ld.so.conf.d/usr_local.conf<br>-                /sbin/ldconfig<br>        fi<br> <br>         # Only install pjproject if it wasn't installed via package<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/6993">change 6993</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/6993"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I13125839a79052356469e41edacbebff0a937d39 </div>
<div style="display:none"> Gerrit-Change-Number: 6993 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Alexander Traud <pabstraud@compuserve.com> </div>
<div style="display:none"> Gerrit-Reviewer: Alexander Traud <pabstraud@compuserve.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Matthew Fredrickson <creslin@digium.com> </div>