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

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 c4dbb49e62f7a77ce8f252ea1e7c970972f53926..2967e72cf334e299fb00f232504cf70bda90524b 100644 (file)
--- 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 (file)
index 080e2a1..0000000
--- 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 (file)
index 0000000..9542ae1
--- /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 8756a090c1af4c3d5fb7a25679f6a7fa0cb78abe..71b64e55eb8ca4dbe338bd485267c52ab322e8e3 100644 (file)
--- 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