mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-13 16:21:01 +00:00
pjproject: Update bundled to 2.15.1.
This resolves a security issue where RTP ports weren't being released causing possible resource exhaustion issues. Resolves: #GHSA-557q-795j-wfx2
This commit is contained in:
committed by
github-actions[bot]
parent
6158cc7b8e
commit
0278f5bde1
@@ -1,47 +1,34 @@
|
||||
From e8000cc80e5f8ba02cc52852edc02cdb0e949525 Mon Sep 17 00:00:00 2001
|
||||
From: Richard Mudgett <rmudgett@digium.com>
|
||||
Date: Mon, 6 Aug 2018 11:24:25 -0500
|
||||
Subject: [PATCH 1/5] 0000-configure-ssl-library-path.patch
|
||||
|
||||
---
|
||||
aconfigure | 6 +++++-
|
||||
aconfigure.ac | 6 +++++-
|
||||
2 files changed, 10 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/aconfigure b/aconfigure
|
||||
index 1c449b8..c4c6060 100755
|
||||
index d6f0e8809..9dcd46398 100755
|
||||
--- a/aconfigure
|
||||
+++ b/aconfigure
|
||||
@@ -7954,7 +7954,11 @@ else
|
||||
if test "x$with_ssl" != "xno" -a "x$with_ssl" != "x"; then
|
||||
CFLAGS="$CFLAGS -I$with_ssl/include"
|
||||
CPPFLAGS="$CPPFLAGS -I$with_ssl/include"
|
||||
- LDFLAGS="$LDFLAGS -L$with_ssl/lib"
|
||||
+ if test -d $with_ssl/lib; then
|
||||
+ LDFLAGS="$LDFLAGS -L$with_ssl/lib"
|
||||
+ else
|
||||
+ LDFLAGS="$LDFLAGS -L$with_ssl"
|
||||
+ fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Using SSL prefix... $with_ssl" >&5
|
||||
$as_echo "Using SSL prefix... $with_ssl" >&6; }
|
||||
fi
|
||||
@@ -9768,7 +9768,11 @@
|
||||
if test "x$with_ssl" != "xno" -a "x$with_ssl" != "x"; then
|
||||
CFLAGS="$CFLAGS -I$with_ssl/include"
|
||||
CPPFLAGS="$CPPFLAGS -I$with_ssl/include"
|
||||
- LDFLAGS="$LDFLAGS -L$with_ssl/lib"
|
||||
+ if test -d $with_ssl/lib; then
|
||||
+ LDFLAGS="$LDFLAGS -L$with_ssl/lib"
|
||||
+ else
|
||||
+ LDFLAGS="$LDFLAGS -L$with_ssl"
|
||||
+ fi
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Using SSL prefix... $with_ssl" >&5
|
||||
printf "%s\n" "Using SSL prefix... $with_ssl" >&6; }
|
||||
fi
|
||||
diff --git a/aconfigure.ac b/aconfigure.ac
|
||||
index 2c272cd..a5d6d97 100644
|
||||
index 16b311045..849da81ab 100644
|
||||
--- a/aconfigure.ac
|
||||
+++ b/aconfigure.ac
|
||||
@@ -1580,7 +1580,11 @@ AC_ARG_ENABLE(ssl,
|
||||
if test "x$with_ssl" != "xno" -a "x$with_ssl" != "x"; then
|
||||
CFLAGS="$CFLAGS -I$with_ssl/include"
|
||||
CPPFLAGS="$CPPFLAGS -I$with_ssl/include"
|
||||
- LDFLAGS="$LDFLAGS -L$with_ssl/lib"
|
||||
+ if test -d $with_ssl/lib; then
|
||||
+ LDFLAGS="$LDFLAGS -L$with_ssl/lib"
|
||||
+ else
|
||||
+ LDFLAGS="$LDFLAGS -L$with_ssl"
|
||||
+ fi
|
||||
AC_MSG_RESULT([Using SSL prefix... $with_ssl])
|
||||
fi
|
||||
@@ -2172,7 +2172,11 @@
|
||||
if test "x$with_ssl" != "xno" -a "x$with_ssl" != "x"; then
|
||||
CFLAGS="$CFLAGS -I$with_ssl/include"
|
||||
CPPFLAGS="$CPPFLAGS -I$with_ssl/include"
|
||||
- LDFLAGS="$LDFLAGS -L$with_ssl/lib"
|
||||
+ if test -d $with_ssl/lib; then
|
||||
+ LDFLAGS="$LDFLAGS -L$with_ssl/lib"
|
||||
+ else
|
||||
+ LDFLAGS="$LDFLAGS -L$with_ssl"
|
||||
+ fi
|
||||
AC_MSG_RESULT([Using SSL prefix... $with_ssl])
|
||||
fi
|
||||
|
||||
--
|
||||
2.7.4
|
||||
|
||||
|
Reference in New Issue
Block a user