From 58035702cb1eabc3158b3af0f5d98ec0d44a47f7 Mon Sep 17 00:00:00 2001
From: Richard Mudgett <rmudgett@digium.com>
Date: Tue, 18 Sep 2018 13:59:21 -0500
Subject: [PATCH] pjproject: Update initial 2.8 patches to apply cleanly.
ASTERISK-28059
Change-Id: I027472f2753391646dde594a709a75f14422db93
---
.../0000-configure-ssl-library-path.patch | 41 ++++++++++++--
.../patches/0000-remove-third-party.patch | 13 +++--
.../0000-set_apps_initial_log_level.patch | 8 +--
.../pjproject/patches/0000-solaris.patch | 22 ++++----
...-timer-Clean-up-usage-of-timer-heap.patch} | 56 +++++++++----------
5 files changed, 86 insertions(+), 54 deletions(-)
rename third-party/pjproject/patches/{0080-timer-Clean-up-usage-of-timer-heap.patch => 0010-timer-Clean-up-usage-of-timer-heap.patch} (94%)
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 0ec0e7a0e3..3c1f7498d8 100644
--- a/third-party/pjproject/patches/0000-configure-ssl-library-path.patch
+++ b/third-party/pjproject/patches/0000-configure-ssl-library-path.patch
@@ -1,18 +1,47 @@
---- a/aconfigure.ac (PJSIP 2.7.2)
-+++ b/aconfigure.ac (working copy)
-@@ -1571 +1571,5 @@
+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
+--- 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
---- a/aconfigure (PJSIP 2.7.2)
-+++ b/aconfigure (working copy)
-@@ -7884 +7884,5 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using SSL prefix... $with_ssl" >&5
+ $as_echo "Using SSL prefix... $with_ssl" >&6; }
+ fi
+diff --git a/aconfigure.ac b/aconfigure.ac
+index 2c272cd..a5d6d97 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
+
+--
+2.7.4
+
diff --git a/third-party/pjproject/patches/0000-remove-third-party.patch b/third-party/pjproject/patches/0000-remove-third-party.patch
index 54d8774c76..f25aeac176 100644
--- a/third-party/pjproject/patches/0000-remove-third-party.patch
+++ b/third-party/pjproject/patches/0000-remove-third-party.patch
@@ -1,14 +1,14 @@
-From 1ec66eb253c603e06fedff5710e701dc0e55c697 Mon Sep 17 00:00:00 2001
+From 665a2fbc3a09a71cd77988ae2deb3f5d3e205f63 Mon Sep 17 00:00:00 2001
From: Richard Mudgett <rmudgett@digium.com>
Date: Thu, 23 Feb 2017 17:10:07 -0600
-Subject: [PATCH 1/3] 0000-remove-third-party.patch
+Subject: [PATCH 2/5] 0000-remove-third-party.patch
---
- build.mak.in | 107 -----------------------------------------------------------
- 1 file changed, 107 deletions(-)
+ build.mak.in | 97 ------------------------------------------------------------
+ 1 file changed, 97 deletions(-)
diff --git a/build.mak.in b/build.mak.in
-index 80ccad12..41ec64ea 100644
+index 80ccad1..41ec64e 100644
--- a/build.mak.in
+++ b/build.mak.in
@@ -1,4 +1,3 @@
@@ -126,3 +126,6 @@ index 80ccad12..41ec64ea 100644
# Additional flags
@ac_build_mak_vars@
+--
+2.7.4
+
diff --git a/third-party/pjproject/patches/0000-set_apps_initial_log_level.patch b/third-party/pjproject/patches/0000-set_apps_initial_log_level.patch
index 3eed240034..b1fe02c0d5 100644
--- a/third-party/pjproject/patches/0000-set_apps_initial_log_level.patch
+++ b/third-party/pjproject/patches/0000-set_apps_initial_log_level.patch
@@ -1,7 +1,7 @@
-From 34f25c67f17be80814ddb16edc6c76d30213ca1b Mon Sep 17 00:00:00 2001
+From c40ad6ba454fdf6456d8ffa92faa4cd49f2c807d Mon Sep 17 00:00:00 2001
From: Richard Mudgett <rmudgett@digium.com>
Date: Thu, 23 Feb 2017 17:11:00 -0600
-Subject: [PATCH 2/3] 0000-set_apps_initial_log_level.patch
+Subject: [PATCH 3/5] 0000-set_apps_initial_log_level.patch
---
pjsip-apps/src/pjsua/main.c | 2 ++
@@ -35,10 +35,10 @@ index 122cdc7..dc79eab 100644
return 1;
diff --git a/pjsip-apps/src/python/_pjsua.c b/pjsip-apps/src/python/_pjsua.c
-index fb80e23..c9b21d8 100644
+index 31b835e..3e15030 100644
--- a/pjsip-apps/src/python/_pjsua.c
+++ b/pjsip-apps/src/python/_pjsua.c
-@@ -4437,7 +4437,8 @@ init_pjsua(void)
+@@ -4434,7 +4434,8 @@ init_pjsua(void)
PyObject* m = NULL;
#define ADD_CONSTANT(mod,name) PyModule_AddIntConstant(mod,#name,name)
diff --git a/third-party/pjproject/patches/0000-solaris.patch b/third-party/pjproject/patches/0000-solaris.patch
index 0e25c55161..155cdbee5e 100644
--- a/third-party/pjproject/patches/0000-solaris.patch
+++ b/third-party/pjproject/patches/0000-solaris.patch
@@ -1,7 +1,7 @@
-From 8f8a9dc7203bfcd5557ad5c2f15359308535c4bb Mon Sep 17 00:00:00 2001
+From 1ac599a0f29500a15faf0dbbdc2565cc7dce2420 Mon Sep 17 00:00:00 2001
From: Shaun Ruffell <sruffell@digium.com>
Date: Fri, 7 Sep 2012 14:31:19 -0500
-Subject: [PATCH] pjproject: Fix for Solaris builds. Do not undef s_addr.
+Subject: [PATCH 4/5] pjproject: Fix for Solaris builds. Do not undef s_addr.
pjproject, in order to solve build problems on Windows [1], undefines s_addr in
one of it's headers that is included in res_rtp_asterisk.c. On Solaris s_addr is
@@ -38,15 +38,15 @@ Reported-by: Ben Klang
Updated by ASTERISK-27997
---
- pjlib/include/pj/sock.h | 8 +++++++-
- pjlib/src/pj/sock_bsd.c | 2 +-
- pjlib/src/pj/sock_symbian.cpp | 2 +-
- pjlib/src/pj/sock_uwp.cpp | 2 +-
- pjsip/src/test/transport_test.c | 2 +-
- 6 files changed, 12 insertions(+), 6 deletions(-)
+ pjlib/include/pj/sock.h | 8 +++++++-
+ pjlib/src/pj/sock_bsd.c | 2 +-
+ pjlib/src/pj/sock_symbian.cpp | 2 +-
+ pjlib/src/pj/sock_uwp.cpp | 2 +-
+ pjsip/src/test/transport_test.c | 2 +-
+ 5 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/pjlib/include/pj/sock.h b/pjlib/include/pj/sock.h
-index 8fc833c..c415358 100644
+index 4daf298..c35833c 100644
--- a/pjlib/include/pj/sock.h
+++ b/pjlib/include/pj/sock.h
@@ -484,6 +484,7 @@ typedef enum pj_socket_sd_type
@@ -69,7 +69,7 @@ index 8fc833c..c415358 100644
/**
* Maximum length of text representation of an IPv4 address.
-@@ -714,7 +720,7 @@ PJ_DECL(char*) pj_inet_ntoa(pj_in_addr inaddr);
+@@ -712,7 +718,7 @@ PJ_DECL(char*) pj_inet_ntoa(pj_in_addr inaddr);
*
* @return nonzero if the address is valid, zero if not.
*/
@@ -79,7 +79,7 @@ index 8fc833c..c415358 100644
/**
* This function converts an address in its standard text presentation form
diff --git a/pjlib/src/pj/sock_bsd.c b/pjlib/src/pj/sock_bsd.c
-index 95c3804..daefc54 100644
+index e416991..940fce1 100644
--- a/pjlib/src/pj/sock_bsd.c
+++ b/pjlib/src/pj/sock_bsd.c
@@ -244,7 +244,7 @@ PJ_DEF(char*) pj_inet_ntoa(pj_in_addr inaddr)
diff --git a/third-party/pjproject/patches/0080-timer-Clean-up-usage-of-timer-heap.patch b/third-party/pjproject/patches/0010-timer-Clean-up-usage-of-timer-heap.patch
similarity index 94%
rename from third-party/pjproject/patches/0080-timer-Clean-up-usage-of-timer-heap.patch
rename to third-party/pjproject/patches/0010-timer-Clean-up-usage-of-timer-heap.patch
index 6c139ba18a..adde49b335 100644
--- a/third-party/pjproject/patches/0080-timer-Clean-up-usage-of-timer-heap.patch
+++ b/third-party/pjproject/patches/0010-timer-Clean-up-usage-of-timer-heap.patch
@@ -1,7 +1,7 @@
-From 853005378de2ffecee7774e095d8cbfbfa0ab706 Mon Sep 17 00:00:00 2001
+From f7d91ca2a3c562066f95db066381a8b956ded98f Mon Sep 17 00:00:00 2001
From: George Joseph <gjoseph@digium.com>
Date: Tue, 2 Jan 2018 06:36:46 -0700
-Subject: [PATCH] timer: Clean up usage of timer heap
+Subject: [PATCH 5/5] timer: Clean up usage of timer heap
Added a new pj_timer_entry_reset function that resets a timer_entry
for re-use.
@@ -29,14 +29,13 @@ Fixed issues where timers were being rescheduled incorrectly.
15 files changed, 64 insertions(+), 25 deletions(-)
diff --git a/pjlib/include/pj/timer.h b/pjlib/include/pj/timer.h
-index df6155a81..90fc8ac85 100644
+index df6155a..90fc8ac 100644
--- a/pjlib/include/pj/timer.h
+++ b/pjlib/include/pj/timer.h
-@@ -212,6 +212,20 @@ PJ_DECL(pj_timer_entry*) pj_timer_entry_init( pj_timer_entry *entry,
- void *user_data,
+@@ -213,6 +213,20 @@ PJ_DECL(pj_timer_entry*) pj_timer_entry_init( pj_timer_entry *entry,
pj_timer_heap_callback *cb );
-+/**
+ /**
+ * Reset a timer entry. Application should call this function before reusing
+ * the timer entry.
+ *
@@ -50,14 +49,15 @@ index df6155a81..90fc8ac85 100644
+PJ_DECL(pj_timer_entry*) pj_timer_entry_reset( pj_timer_entry *entry,
+ int id);
+
- /**
++/**
* Queries whether a timer entry is currently running.
*
+ * @param entry The timer entry to query.
diff --git a/pjlib/src/pj/ssl_sock_ossl.c b/pjlib/src/pj/ssl_sock_ossl.c
-index 969cc1420..ead1a8fbb 100644
+index 738fb8b..fb3b359 100644
--- a/pjlib/src/pj/ssl_sock_ossl.c
+++ b/pjlib/src/pj/ssl_sock_ossl.c
-@@ -291,6 +291,7 @@ struct pj_ssl_cert_t
+@@ -304,6 +304,7 @@ struct pj_ssl_cert_t
static write_data_t* alloc_send_data(pj_ssl_sock_t *ssock, pj_size_t len);
static void free_send_data(pj_ssl_sock_t *ssock, write_data_t *wdata);
static pj_status_t flush_delayed_send(pj_ssl_sock_t *ssock);
@@ -65,7 +65,7 @@ index 969cc1420..ead1a8fbb 100644
/*
*******************************************************************
-@@ -1621,7 +1622,8 @@ static pj_bool_t on_handshake_complete(pj_ssl_sock_t *ssock,
+@@ -1726,7 +1727,8 @@ static pj_bool_t on_handshake_complete(pj_ssl_sock_t *ssock,
pj_timer_heap_cancel(ssock->param.timer_heap,
&ssock->timer);
}
@@ -75,7 +75,7 @@ index 969cc1420..ead1a8fbb 100644
pj_time_val_normalize(&interval);
if (pj_timer_heap_schedule(ssock->param.timer_heap,
&ssock->timer, &interval) != 0)
-@@ -2387,7 +2389,7 @@ static pj_bool_t asock_on_accept_complete (pj_activesock_t *asock,
+@@ -2492,7 +2494,7 @@ static pj_bool_t asock_on_accept_complete (pj_activesock_t *asock,
ssock->param.timeout.msec != 0))
{
pj_assert(ssock->timer.id == TIMER_NONE);
@@ -84,7 +84,7 @@ index 969cc1420..ead1a8fbb 100644
status = pj_timer_heap_schedule(ssock->param.timer_heap,
&ssock->timer,
&ssock->param.timeout);
-@@ -3405,7 +3407,7 @@ PJ_DEF(pj_status_t) pj_ssl_sock_start_connect( pj_ssl_sock_t *ssock,
+@@ -3538,7 +3540,7 @@ PJ_DEF(pj_status_t) pj_ssl_sock_start_connect( pj_ssl_sock_t *ssock,
ssock->param.timeout.msec != 0))
{
pj_assert(ssock->timer.id == TIMER_NONE);
@@ -94,7 +94,7 @@ index 969cc1420..ead1a8fbb 100644
&ssock->timer,
&ssock->param.timeout);
diff --git a/pjlib/src/pj/timer.c b/pjlib/src/pj/timer.c
-index 90a95e37b..13126116f 100644
+index 90a95e3..1312611 100644
--- a/pjlib/src/pj/timer.c
+++ b/pjlib/src/pj/timer.c
@@ -472,6 +472,18 @@ PJ_DEF(pj_timer_entry*) pj_timer_entry_init( pj_timer_entry *entry,
@@ -117,7 +117,7 @@ index 90a95e37b..13126116f 100644
{
return (entry->_timer_id >= 1);
diff --git a/pjnath/src/pjnath/ice_session.c b/pjnath/src/pjnath/ice_session.c
-index 63a0d1c9c..6d0e6abc9 100644
+index c51dba7..cbee91d 100644
--- a/pjnath/src/pjnath/ice_session.c
+++ b/pjnath/src/pjnath/ice_session.c
@@ -1246,6 +1246,7 @@ done:
@@ -179,7 +179,7 @@ index 63a0d1c9c..6d0e6abc9 100644
&clist->timer, &delay,
PJ_TRUE, ice->grp_lock);
diff --git a/pjnath/src/pjnath/nat_detect.c b/pjnath/src/pjnath/nat_detect.c
-index 8a2408374..7bb364798 100644
+index 31b06c3..d1d7373 100644
--- a/pjnath/src/pjnath/nat_detect.c
+++ b/pjnath/src/pjnath/nat_detect.c
@@ -414,6 +414,7 @@ static void end_session(nat_detect_session *sess,
@@ -199,10 +199,10 @@ index 8a2408374..7bb364798 100644
} else {
te->id = 0;
diff --git a/pjnath/src/pjnath/stun_sock.c b/pjnath/src/pjnath/stun_sock.c
-index 6028e0c47..3aab27a1d 100644
+index 4031bb3..af3cc4a 100644
--- a/pjnath/src/pjnath/stun_sock.c
+++ b/pjnath/src/pjnath/stun_sock.c
-@@ -864,7 +864,7 @@ static void start_ka_timer(pj_stun_sock *stun_sock)
+@@ -880,7 +880,7 @@ static void start_ka_timer(pj_stun_sock *stun_sock)
delay.sec = stun_sock->ka_interval;
delay.msec = 0;
@@ -212,7 +212,7 @@ index 6028e0c47..3aab27a1d 100644
&stun_sock->ka_timer,
&delay, PJ_TRUE,
diff --git a/pjnath/src/pjnath/stun_transaction.c b/pjnath/src/pjnath/stun_transaction.c
-index 28f623005..ad87b7b6c 100644
+index 28f6230..ad87b7b 100644
--- a/pjnath/src/pjnath/stun_transaction.c
+++ b/pjnath/src/pjnath/stun_transaction.c
@@ -86,11 +86,8 @@ PJ_DEF(pj_status_t) pj_stun_client_tsx_create(pj_stun_config *cfg,
@@ -254,7 +254,7 @@ index 28f623005..ad87b7b6c 100644
&tsx->retransmit_timer,
&tsx->retransmit_time,
diff --git a/pjnath/src/pjnath/turn_session.c b/pjnath/src/pjnath/turn_session.c
-index bbea027f3..e4685e625 100644
+index bbea027..e4685e6 100644
--- a/pjnath/src/pjnath/turn_session.c
+++ b/pjnath/src/pjnath/turn_session.c
@@ -431,6 +431,7 @@ static void sess_shutdown(pj_turn_session *sess,
@@ -282,7 +282,7 @@ index bbea027f3..e4685e625 100644
&delay, TIMER_KEEP_ALIVE,
sess->grp_lock);
diff --git a/pjnath/src/pjnath/turn_sock.c b/pjnath/src/pjnath/turn_sock.c
-index a30ab5153..507858048 100644
+index a30ab51..5078580 100644
--- a/pjnath/src/pjnath/turn_sock.c
+++ b/pjnath/src/pjnath/turn_sock.c
@@ -928,6 +928,7 @@ static void turn_on_state(pj_turn_session *sess,
@@ -294,7 +294,7 @@ index a30ab5153..507858048 100644
&turn_sock->timer,
&delay, TIMER_DESTROY,
diff --git a/pjnath/src/pjturn-srv/allocation.c b/pjnath/src/pjturn-srv/allocation.c
-index 6c9c9ce11..88533926b 100644
+index 6c9c9ce..8853392 100644
--- a/pjnath/src/pjturn-srv/allocation.c
+++ b/pjnath/src/pjturn-srv/allocation.c
@@ -513,7 +513,7 @@ static void alloc_shutdown(pj_turn_allocation *alloc)
@@ -316,7 +316,7 @@ index 6c9c9ce11..88533926b 100644
&alloc->relay.timer, &delay);
if (status != PJ_SUCCESS) {
diff --git a/pjnath/src/pjturn-srv/listener_tcp.c b/pjnath/src/pjturn-srv/listener_tcp.c
-index 796ed471b..4a9550c2e 100644
+index 796ed47..4a9550c 100644
--- a/pjnath/src/pjturn-srv/listener_tcp.c
+++ b/pjnath/src/pjturn-srv/listener_tcp.c
@@ -475,7 +475,7 @@ static void tcp_dec_ref(pj_turn_transport *tp,
@@ -329,7 +329,7 @@ index 796ed471b..4a9550c2e 100644
&tcp->timer, &delay);
}
diff --git a/pjsip/src/pjsip-simple/evsub.c b/pjsip/src/pjsip-simple/evsub.c
-index eb666654f..7748853d2 100644
+index eb66665..7748853 100644
--- a/pjsip/src/pjsip-simple/evsub.c
+++ b/pjsip/src/pjsip-simple/evsub.c
@@ -518,6 +518,7 @@ static void set_timer( pjsip_evsub *sub, int timer_id,
@@ -360,7 +360,7 @@ index eb666654f..7748853d2 100644
/* Set name. */
pj_ansi_snprintf(sub->obj_name, PJ_ARRAY_SIZE(sub->obj_name),
diff --git a/pjsip/src/pjsip/sip_endpoint.c b/pjsip/src/pjsip/sip_endpoint.c
-index d810781d5..5c98a5bf6 100644
+index d810781..5c98a5b 100644
--- a/pjsip/src/pjsip/sip_endpoint.c
+++ b/pjsip/src/pjsip/sip_endpoint.c
@@ -788,6 +788,7 @@ PJ_DEF(pj_status_t) pjsip_endpt_schedule_timer_dbg(pjsip_endpoint *endpt,
@@ -389,7 +389,7 @@ index d810781d5..5c98a5bf6 100644
/*
diff --git a/pjsip/src/pjsip/sip_transaction.c b/pjsip/src/pjsip/sip_transaction.c
-index d52b12a72..5236e63f7 100644
+index 4b7f852..173bd6a 100644
--- a/pjsip/src/pjsip/sip_transaction.c
+++ b/pjsip/src/pjsip/sip_transaction.c
@@ -978,6 +978,7 @@ static pj_status_t tsx_schedule_timer(pjsip_transaction *tsx,
@@ -416,10 +416,10 @@ index d52b12a72..5236e63f7 100644
if (grp_lock) {
tsx->grp_lock = grp_lock;
diff --git a/pjsip/src/pjsip/sip_transport.c b/pjsip/src/pjsip/sip_transport.c
-index 3d27d5d71..834babeae 100644
+index 17e9142..22f4dc1 100644
--- a/pjsip/src/pjsip/sip_transport.c
+++ b/pjsip/src/pjsip/sip_transport.c
-@@ -1092,8 +1092,7 @@ PJ_DEF(pj_status_t) pjsip_transport_register( pjsip_tpmgr *mgr,
+@@ -1139,8 +1139,7 @@ PJ_DEF(pj_status_t) pjsip_transport_register( pjsip_tpmgr *mgr,
/* Init. */
tp->tpmgr = mgr;
pj_bzero(&tp->idle_timer, sizeof(tp->idle_timer));
@@ -430,5 +430,5 @@ index 3d27d5d71..834babeae 100644
/*
* Register to hash table (see Trac ticket #42).
--
-2.14.3
+2.7.4
--
GitLab