From 2e8d8c4a08f48128e715af4749f7f4710748c368 Mon Sep 17 00:00:00 2001 From: Stanislav Abramenkov Date: Tue, 3 Dec 2024 22:25:40 +0200 Subject: [PATCH] Upgrade bundled pjproject to 2.15.1 Resolves: asterisk#1016 UserNote: Bundled pjproject has been upgraded to 2.15.1. For more information visit pjproject Github page: https://github.com/pjsip/pjproject/releases/tag/2.15.1 --- .../0000-configure-ssl-library-path.patch | 48 +++++++++---------- .../pjproject/pjproject-2.14.1.tar.bz2.md5 | 1 - .../pjproject/pjproject-2.15.1.tar.bz2.md5 | 1 + third-party/versions.mak | 2 +- 4 files changed, 26 insertions(+), 26 deletions(-) delete mode 100644 third-party/pjproject/pjproject-2.14.1.tar.bz2.md5 create mode 100644 third-party/pjproject/pjproject-2.15.1.tar.bz2.md5 diff --git a/third-party/pjproject/patches/0000-configure-ssl-library-path.patch b/third-party/pjproject/patches/0000-configure-ssl-library-path.patch index c4dbb49e62..2967e72cf3 100644 --- a/third-party/pjproject/patches/0000-configure-ssl-library-path.patch +++ b/third-party/pjproject/patches/0000-configure-ssl-library-path.patch @@ -2,33 +2,33 @@ diff --git a/aconfigure b/aconfigure index d6f0e8809..9dcd46398 100755 --- a/aconfigure +++ b/aconfigure -@@ -8986,7 +8986,11 @@ else $as_nop - 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 +@@ -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 + fi diff --git a/aconfigure.ac b/aconfigure.ac index 16b311045..849da81ab 100644 --- a/aconfigure.ac +++ b/aconfigure.ac -@@ -1838,7 +1838,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 diff --git a/third-party/pjproject/pjproject-2.14.1.tar.bz2.md5 b/third-party/pjproject/pjproject-2.14.1.tar.bz2.md5 deleted file mode 100644 index 080e2a10d6..0000000000 --- a/third-party/pjproject/pjproject-2.14.1.tar.bz2.md5 +++ /dev/null @@ -1 +0,0 @@ -de9feca3e4816b1535f63f9d23c7b45b pjproject-2.14.1.tar.bz2 diff --git a/third-party/pjproject/pjproject-2.15.1.tar.bz2.md5 b/third-party/pjproject/pjproject-2.15.1.tar.bz2.md5 new file mode 100644 index 0000000000..9542ae1f2c --- /dev/null +++ b/third-party/pjproject/pjproject-2.15.1.tar.bz2.md5 @@ -0,0 +1 @@ +6b4b34c14d39224d3342d368f5abbad4 pjproject-2.15.1.tar.bz2 diff --git a/third-party/versions.mak b/third-party/versions.mak index 8756a090c1..71b64e55eb 100644 --- a/third-party/versions.mak +++ b/third-party/versions.mak @@ -2,5 +2,5 @@ # configure script so it must follow 'shell' # syntax as well as 'make' syntax. JANSSON_VERSION=2.14 -PJPROJECT_VERSION=2.14.1 +PJPROJECT_VERSION=2.15.1 LIBJWT_VERSION=1.15.3