From 376473b38c0a6f4a8e742a26caafbf484ed1b9c5 Mon Sep 17 00:00:00 2001
From: Andre Heider <a.heider@gmail.com>
Date: Thu, 7 Oct 2021 18:31:07 +0200
Subject: [PATCH 1/3] pjproject: sync patches with asterisk 18.7.1

Switch to AUTORELEASE while at it.

Signed-off-by: Andre Heider <a.heider@gmail.com>
---
 libs/pjproject/Makefile                       |  2 +-
 ..._get_rtpmap-Strip-param-trailing-whi.patch | 27 +++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 libs/pjproject/patches/0120-pjmedia_sdp_attr_get_rtpmap-Strip-param-trailing-whi.patch

diff --git a/libs/pjproject/Makefile b/libs/pjproject/Makefile
index 7d441cb..3347b3e 100644
--- a/libs/pjproject/Makefile
+++ b/libs/pjproject/Makefile
@@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pjproject
 PKG_VERSION:=2.10
-PKG_RELEASE:=4
+PKG_RELEASE:=$(AUTORELEASE)
 
 # download "vX.Y.tar.gz" as "pjproject-vX.Y.tar.gz"
 PKG_SOURCE_URL_FILE:=$(PKG_VERSION).tar.gz
diff --git a/libs/pjproject/patches/0120-pjmedia_sdp_attr_get_rtpmap-Strip-param-trailing-whi.patch b/libs/pjproject/patches/0120-pjmedia_sdp_attr_get_rtpmap-Strip-param-trailing-whi.patch
new file mode 100644
index 0000000..a3e668c
--- /dev/null
+++ b/libs/pjproject/patches/0120-pjmedia_sdp_attr_get_rtpmap-Strip-param-trailing-whi.patch
@@ -0,0 +1,27 @@
+From 2ae784030b0d9cf217c3d562af20e4967f19a3dc Mon Sep 17 00:00:00 2001
+From: George Joseph <gjoseph@sangoma.com>
+Date: Tue, 14 Sep 2021 10:47:29 -0600
+Subject: [PATCH] pjmedia_sdp_attr_get_rtpmap: Strip param trailing whitespace
+
+Use pj_scan_get() to parse the param part of rtpmap so
+trailing whitespace is automatically stripped.
+
+Fixes #2827
+---
+ pjmedia/src/pjmedia/sdp.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/pjmedia/src/pjmedia/sdp.c
++++ b/pjmedia/src/pjmedia/sdp.c
+@@ -313,9 +313,9 @@ PJ_DEF(pj_status_t) pjmedia_sdp_attr_get
+ 
+ 	/* Expecting either '/' or EOF */
+ 	if (*scanner.curptr == '/') {
++	    /* Skip the '/' */
+ 	    pj_scan_get_char(&scanner);
+-	    rtpmap->param.ptr = scanner.curptr;
+-	    rtpmap->param.slen = scanner.end - scanner.curptr;
++	    pj_scan_get(&scanner, &cs_token, &rtpmap->param);
+ 	} else {
+ 	    rtpmap->param.slen = 0;
+ 	}

From 0399a3dc730ae639636bcd053193b37751f8df4d Mon Sep 17 00:00:00 2001
From: Andre Heider <a.heider@gmail.com>
Date: Tue, 28 Sep 2021 20:11:44 +0200
Subject: [PATCH 2/3] asterisk: bump to 18.7.1

The removed patch has been applied upstream and is part of this release.

Switch to AUTORELEASE while at it.

Signed-off-by: Andre Heider <a.heider@gmail.com>
---
 net/asterisk/Makefile                         |   6 +-
 ...-A-option-to-add-caller-announcement.patch | 147 ------------------
 .../patches/140-use-default-lua.patch         |   2 +-
 3 files changed, 4 insertions(+), 151 deletions(-)
 delete mode 100644 net/asterisk/patches/090-app_dial-expanded-A-option-to-add-caller-announcement.patch

diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile
index 7cbcf9b..b2d9f34 100644
--- a/net/asterisk/Makefile
+++ b/net/asterisk/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=asterisk
-PKG_VERSION:=18.5.1
-PKG_RELEASE:=1
+PKG_VERSION:=18.7.1
+PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://downloads.asterisk.org/pub/telephony/asterisk/releases
-PKG_HASH:=e7d78716a0deeadf24b7d537cd24c11c2d9a096265eefc9470565c4da0fc54c7
+PKG_HASH:=11c8728718b59af74440276ba888484bc9201217719d56436e1e0e85bf533c17
 
 PKG_BUILD_DEPENDS:=libxml2/host
 
diff --git a/net/asterisk/patches/090-app_dial-expanded-A-option-to-add-caller-announcement.patch b/net/asterisk/patches/090-app_dial-expanded-A-option-to-add-caller-announcement.patch
deleted file mode 100644
index bd20730..0000000
--- a/net/asterisk/patches/090-app_dial-expanded-A-option-to-add-caller-announcement.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-From 1e5a2cfe3037823b17dd4ac47b071f02d6f9825f Mon Sep 17 00:00:00 2001
-From: Naveen Albert <mail@interlinked.x10host.com>
-Date: Fri, 21 May 2021 20:08:58 -0400
-Subject: [PATCH] app_dial: Expanded A option to add caller announcement
-
-Hitherto, the A option has made it possible to play
-audio upon answer to the called party only. This option
-is expanded to allow for playback of an audio file to
-the caller instead of or in addition to the audio
-played to the answerer.
-
-ASTERISK-29442
-
-Change-Id: If6eed3ff5c341dc8c588c8210987f2571e891e5e
----
- apps/app_dial.c                               | 79 +++++++++++++++----
- doc/CHANGES-staging/app_dial_announcement.txt |  6 ++
- 2 files changed, 68 insertions(+), 17 deletions(-)
- create mode 100644 doc/CHANGES-staging/app_dial_announcement.txt
-
---- a/apps/app_dial.c
-+++ b/apps/app_dial.c
-@@ -93,11 +93,17 @@
- 			</parameter>
- 			<parameter name="options" required="false">
- 				<optionlist>
--				<option name="A">
--					<argument name="x" required="true">
-+				<option name="A" argsep=":">
-+					<argument name="x">
- 						<para>The file to play to the called party</para>
- 					</argument>
--					<para>Play an announcement to the called party, where <replaceable>x</replaceable> is the prompt to be played</para>
-+					<argument name="y">
-+						<para>The file to play to the calling party</para>
-+					</argument>
-+					<para>Play an announcement to the called and/or calling parties, where <replaceable>x</replaceable>
-+					is the prompt to be played to the called party and <replaceable>y</replaceable> is the prompt
-+					to be played to the caller. The files may be different and will be played to each party
-+					simultaneously.</para>
- 				</option>
- 				<option name="a">
- 					<para>Immediately answer the calling channel when the called channel answers in
-@@ -2941,33 +2947,71 @@ static int dial_exec_full(struct ast_cha
- 			int digit = 0;
- 			struct ast_channel *chans[2];
- 			struct ast_channel *active_chan;
-+			char *calledfile = NULL, *callerfile = NULL;
-+			int calledstream = 0, callerstream = 0;
- 
- 			chans[0] = chan;
- 			chans[1] = peer;
- 
--			/* we need to stream the announcement to the called party when the OPT_ARG_ANNOUNCE (-A) is setted */
--
--			/* stream the file */
--			res = ast_streamfile(peer, opt_args[OPT_ARG_ANNOUNCE], ast_channel_language(peer));
--			if (res) {
--				res = 0;
--				ast_log(LOG_ERROR, "error streaming file '%s' to callee\n", opt_args[OPT_ARG_ANNOUNCE]);
-+			/* we need to stream the announcement(s) when the OPT_ARG_ANNOUNCE (-A) is set */
-+			callerfile = opt_args[OPT_ARG_ANNOUNCE];
-+			calledfile = strsep(&callerfile, ":");
-+
-+			/* stream the file(s) */
-+			if (!ast_strlen_zero(calledfile)) {
-+				res = ast_streamfile(peer, calledfile, ast_channel_language(peer));
-+				if (res) {
-+					res = 0;
-+					ast_log(LOG_ERROR, "error streaming file '%s' to callee\n", calledfile);
-+				} else {
-+					calledstream = 1;
-+				}
-+			}
-+			if (!ast_strlen_zero(callerfile)) {
-+				res = ast_streamfile(chan, callerfile, ast_channel_language(chan));
-+				if (res) {
-+					res = 0;
-+					ast_log(LOG_ERROR, "error streaming file '%s' to caller\n", callerfile);
-+				} else {
-+					callerstream = 1;
-+				}
- 			}
- 
-+			/* can't use ast_waitstream, because we're streaming two files at once, and can't block
-+				We'll need to handle both channels at once. */
-+
- 			ast_channel_set_flag(peer, AST_FLAG_END_DTMF_ONLY);
--			while (ast_channel_stream(peer)) {
--				int ms;
-+			while (ast_channel_stream(peer) || ast_channel_stream(chan)) {
-+				int mspeer, mschan;
- 
--				ms = ast_sched_wait(ast_channel_sched(peer));
-+				mspeer = ast_sched_wait(ast_channel_sched(peer));
-+				mschan = ast_sched_wait(ast_channel_sched(chan));
- 
--				if (ms < 0 && !ast_channel_timingfunc(peer)) {
--					ast_stopstream(peer);
-+				if (calledstream) {
-+					if (mspeer < 0 && !ast_channel_timingfunc(peer)) {
-+						ast_stopstream(peer);
-+						calledstream = 0;
-+					}
-+				}
-+				if (callerstream) {
-+					if (mschan < 0 && !ast_channel_timingfunc(chan)) {
-+						ast_stopstream(chan);
-+						callerstream = 0;
-+					}
-+				}
-+
-+				if (!calledstream && !callerstream) {
- 					break;
- 				}
--				if (ms < 0)
--					ms = 1000;
- 
--				active_chan = ast_waitfor_n(chans, 2, &ms);
-+				if (mspeer < 0)
-+					mspeer = 1000;
-+
-+				if (mschan < 0)
-+					mschan = 1000;
-+
-+				/* wait for the lowest maximum of the two */
-+				active_chan = ast_waitfor_n(chans, 2, (mspeer > mschan ? &mschan : &mspeer));
- 				if (active_chan) {
- 					struct ast_channel *other_chan;
- 					struct ast_frame *fr = ast_read(active_chan);
-@@ -3017,6 +3061,7 @@ static int dial_exec_full(struct ast_cha
- 					ast_frfree(fr);
- 				}
- 				ast_sched_runq(ast_channel_sched(peer));
-+				ast_sched_runq(ast_channel_sched(chan));
- 			}
- 			ast_channel_clear_flag(peer, AST_FLAG_END_DTMF_ONLY);
- 		}
---- /dev/null
-+++ b/doc/CHANGES-staging/app_dial_announcement.txt
-@@ -0,0 +1,6 @@
-+Subject: app_dial announcement option
-+
-+The A option for Dial now supports
-+playing audio to the caller as well
-+as the called party.
-+
diff --git a/net/asterisk/patches/140-use-default-lua.patch b/net/asterisk/patches/140-use-default-lua.patch
index bd7041f..c71aa8a 100644
--- a/net/asterisk/patches/140-use-default-lua.patch
+++ b/net/asterisk/patches/140-use-default-lua.patch
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2555,7 +2555,7 @@ if test -z "$__opus_include" -o x"$__opu
+@@ -2556,7 +2556,7 @@ if test -z "$__opus_include" -o x"$__opu
  fi
  AST_EXT_LIB_CHECK([OPUSFILE], [opusfile], [op_open_callbacks], [opus/opusfile.h], [], [$__opus_include])
  

From a03d6992629a2db64fae7fc454a79820b8d4c131 Mon Sep 17 00:00:00 2001
From: Andre Heider <a.heider@gmail.com>
Date: Wed, 29 Sep 2021 13:49:23 +0200
Subject: [PATCH 3/3] asterisk: adjust for musl 64bit time_t

Fixes #690.

Signed-off-by: Andre Heider <a.heider@gmail.com>
---
 ...170-time-add-support-for-time64-libc.patch | 250 ++++++++++++++++++
 1 file changed, 250 insertions(+)
 create mode 100644 net/asterisk/patches/170-time-add-support-for-time64-libc.patch

diff --git a/net/asterisk/patches/170-time-add-support-for-time64-libc.patch b/net/asterisk/patches/170-time-add-support-for-time64-libc.patch
new file mode 100644
index 0000000..ff4c8b7
--- /dev/null
+++ b/net/asterisk/patches/170-time-add-support-for-time64-libc.patch
@@ -0,0 +1,250 @@
+From 472086370630e1547cf9b497295b4a53d811e872 Mon Sep 17 00:00:00 2001
+From: Sebastian Kemper <sebastian_ml@gmx.net>
+Date: Sun, 17 Oct 2021 20:17:57 +0200
+Subject: [PATCH] time: add support for time64 libc
+
+libcs are implementing changes to fix the year 2038 issue on 32 bit
+platforms (see [1]). musl libc already went ahead and implemented it,
+starting with musl-1.2.0 (see [2]).
+
+Running asterisk on a 32 bit box with a time64 libc causes some
+problems. For instance registering to pjsip doesn't work. The
+registration completes fine, but the AOR disappears immediately, making
+the registered clients unreachable.
+
+This commit adds two new definitions to include/asterisk/time.h:
+
+TIME_T_INT_FMT
+TIME_T_UINT_FMT
+
+If __USE_TIME_BITS64 is defined (by a time64 libc, see [1]), they're set
+to the proper conversions for type int64_t, PRId64 and PRIu64
+respectively. If __USE_TIME_BITS64 is not defined, the status quo
+remains unchanged ("%ld" and "%lu" are used).
+
+The new definitions are used in the different parts of asterisk, where
+appropriate.
+
+These changes get rid of the new warnings that appeared with musl-1.2.0 and
+make the pjsip registration work again. Below an example warning:
+
+In file included from ../include/asterisk.h:23,
+                 from res_pjsip/location.c:19:
+res_pjsip/location.c: In function 'expiration_struct2str':
+../include/asterisk/astmm.h:270:72: warning: format '%ld' expects argument of type 'long int', but argument 6 has type 'time_t' {aka 'long long int'} [-Wformat=]
+  270 |         __ast_asprintf(__FILE__, __LINE__, __PRETTY_FUNCTION__, (ret), (fmt), __VA_ARGS__)
+      |                                                                        ^~~~~
+res_pjsip/location.c:492:17: note: in expansion of macro 'ast_asprintf'
+  492 |         return (ast_asprintf(buf, "%ld", contact->expiration_time.tv_sec) < 0) ? -1 : 0;
+      |                 ^~~~~~~~~~~~
+
+[1] https://sourceware.org/glibc/wiki/Y2038ProofnessDesign
+[2] https://musl.libc.org/time64.html
+
+ASTERISK-29674 #close
+
+Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
+Change-Id: Ic8d61b26033f5c486b917e738c9608b0923a844e
+---
+ include/asterisk/time.h       | 16 ++++++++++++++++
+ res/res_calendar_caldav.c     |  2 +-
+ res/res_calendar_icalendar.c  |  2 +-
+ res/res_http_media_cache.c    |  4 ++--
+ res/res_odbc.c                |  2 +-
+ res/res_pjsip/location.c      |  2 +-
+ res/res_pjsip/pjsip_options.c |  2 +-
+ res/res_pjsip_history.c       | 12 ++++++------
+ res/res_pjsip_pubsub.c        |  2 +-
+ res/res_pjsip_registrar.c     |  2 +-
+ res/res_stir_shaken.c         |  2 +-
+ 11 files changed, 32 insertions(+), 16 deletions(-)
+
+--- a/include/asterisk/time.h
++++ b/include/asterisk/time.h
+@@ -29,6 +29,22 @@
+ #include <sys/time.h>
+ #endif
+ 
++#ifndef TIME_T_INT_FMT
++#ifdef __USE_TIME_BITS64
++#define TIME_T_INT_FMT PRId64
++#else
++#define TIME_T_INT_FMT "ld"
++#endif
++#endif
++
++#ifndef TIME_T_UINT_FMT
++#ifdef __USE_TIME_BITS64
++#define TIME_T_UINT_FMT PRIu64
++#else
++#define TIME_T_UINT_FMT "lu"
++#endif
++#endif
++
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
+--- a/res/res_calendar_caldav.c
++++ b/res/res_calendar_caldav.c
+@@ -405,7 +405,7 @@ static void caldav_add_event(icalcompone
+ 			ast_string_field_set(event, uid, event->summary);
+ 		} else {
+ 			char tmp[100];
+-			snprintf(tmp, sizeof(tmp), "%ld", event->start);
++			snprintf(tmp, sizeof(tmp), "%" TIME_T_INT_FMT, event->start);
+ 			ast_string_field_set(event, uid, tmp);
+ 		}
+ 	}
+--- a/res/res_calendar_icalendar.c
++++ b/res/res_calendar_icalendar.c
+@@ -246,7 +246,7 @@ static void icalendar_add_event(icalcomp
+ 			ast_string_field_set(event, uid, event->summary);
+ 		} else {
+ 			char tmp[100];
+-			snprintf(tmp, sizeof(tmp), "%ld", event->start);
++			snprintf(tmp, sizeof(tmp), "%" TIME_T_INT_FMT, event->start);
+ 			ast_string_field_set(event, uid, tmp);
+ 		}
+ 	}
+--- a/res/res_http_media_cache.c
++++ b/res/res_http_media_cache.c
+@@ -152,7 +152,7 @@ static void bucket_file_set_expiration(s
+ 	}
+ 
+ 	/* Use 'now' if we didn't get an expiration time */
+-	snprintf(time_buf, sizeof(time_buf), "%30lu", actual_expires.tv_sec);
++	snprintf(time_buf, sizeof(time_buf), "%30" TIME_T_UINT_FMT, actual_expires.tv_sec);
+ 
+ 	ast_bucket_file_metadata_set(bucket_file, "__actual_expires", time_buf);
+ }
+@@ -302,7 +302,7 @@ static int bucket_file_expired(struct as
+ 		return 1;
+ 	}
+ 
+-	if (sscanf(metadata->value, "%lu", &expires.tv_sec) != 1) {
++	if (sscanf(metadata->value, "%" TIME_T_UINT_FMT, &expires.tv_sec) != 1) {
+ 		return 1;
+ 	}
+ 
+--- a/res/res_odbc.c
++++ b/res/res_odbc.c
+@@ -1038,7 +1038,7 @@ static odbc_status odbc_obj_connect(stru
+ 	/* Dont connect while server is marked as unreachable via negative_connection_cache */
+ 	negative_cache_expiration = obj->parent->last_negative_connect.tv_sec + obj->parent->negative_connection_cache.tv_sec;
+ 	if (time(NULL) < negative_cache_expiration) {
+-		ast_log(LOG_WARNING, "Not connecting to %s. Negative connection cache for %ld seconds\n", obj->parent->name, negative_cache_expiration - time(NULL));
++		ast_log(LOG_WARNING, "Not connecting to %s. Negative connection cache for %" TIME_T_INT_FMT " seconds\n", obj->parent->name, negative_cache_expiration - time(NULL));
+ 		return ODBC_FAIL;
+ 	}
+ 
+--- a/res/res_pjsip/location.c
++++ b/res/res_pjsip/location.c
+@@ -489,7 +489,7 @@ static int expiration_str2struct(const s
+ static int expiration_struct2str(const void *obj, const intptr_t *args, char **buf)
+ {
+ 	const struct ast_sip_contact *contact = obj;
+-	return (ast_asprintf(buf, "%ld", contact->expiration_time.tv_sec) < 0) ? -1 : 0;
++	return (ast_asprintf(buf, "%" TIME_T_INT_FMT, contact->expiration_time.tv_sec) < 0) ? -1 : 0;
+ }
+ 
+ static int permanent_uri_sort_fn(const void *obj_left, const void *obj_right, int flags)
+--- a/res/res_pjsip/pjsip_options.c
++++ b/res/res_pjsip/pjsip_options.c
+@@ -2733,7 +2733,7 @@ int ast_sip_format_contact_ami(void *obj
+ 	ast_str_append(&buf, 0, "AOR: %s\r\n", wrapper->aor_id);
+ 	ast_str_append(&buf, 0, "URI: %s\r\n", contact->uri);
+ 	ast_str_append(&buf, 0, "UserAgent: %s\r\n", contact->user_agent);
+-	ast_str_append(&buf, 0, "RegExpire: %ld\r\n", contact->expiration_time.tv_sec);
++	ast_str_append(&buf, 0, "RegExpire: %" TIME_T_INT_FMT "\r\n", contact->expiration_time.tv_sec);
+ 	if (!ast_strlen_zero(contact->via_addr)) {
+ 		ast_str_append(&buf, 0, "ViaAddress: %s", contact->via_addr);
+ 		if (contact->via_port) {
+--- a/res/res_pjsip_history.c
++++ b/res/res_pjsip_history.c
+@@ -199,7 +199,7 @@ static int evaluate_equal(struct operato
+ 	{
+ 		struct timeval right = { 0, };
+ 
+-		if (sscanf(op_right->field, "%ld", &right.tv_sec) != 1) {
++		if (sscanf(op_right->field, "%" TIME_T_INT_FMT, &right.tv_sec) != 1) {
+ 			ast_log(LOG_WARNING, "Unable to extract field '%s': not a timestamp\n", op_right->field);
+ 			return -1;
+ 		}
+@@ -270,7 +270,7 @@ static int evaluate_less_than(struct ope
+ 	{
+ 		struct timeval right = { 0, };
+ 
+-		if (sscanf(op_right->field, "%ld", &right.tv_sec) != 1) {
++		if (sscanf(op_right->field, "%" TIME_T_INT_FMT, &right.tv_sec) != 1) {
+ 			ast_log(LOG_WARNING, "Unable to extract field '%s': not a timestamp\n", op_right->field);
+ 			return -1;
+ 		}
+@@ -319,7 +319,7 @@ static int evaluate_greater_than(struct
+ 	{
+ 		struct timeval right = { 0, };
+ 
+-		if (sscanf(op_right->field, "%ld", &right.tv_sec) != 1) {
++		if (sscanf(op_right->field, "%" TIME_T_INT_FMT, &right.tv_sec) != 1) {
+ 			ast_log(LOG_WARNING, "Unable to extract field '%s': not a timestamp\n", op_right->field);
+ 			return -1;
+ 		}
+@@ -668,7 +668,7 @@ static void sprint_list_entry(struct pjs
+ 		char uri[128];
+ 
+ 		pjsip_uri_print(PJSIP_URI_IN_REQ_URI, entry->msg->line.req.uri, uri, sizeof(uri));
+-		snprintf(line, len, "%-5.5d %-10.10ld %-5.5s %-24.24s %.*s %s SIP/2.0",
++		snprintf(line, len, "%-5.5d %-10.10" TIME_T_INT_FMT " %-5.5s %-24.24s %.*s %s SIP/2.0",
+ 			entry->number,
+ 			entry->timestamp.tv_sec,
+ 			entry->transmitted ? "* ==>" : "* <==",
+@@ -677,7 +677,7 @@ static void sprint_list_entry(struct pjs
+ 			pj_strbuf(&entry->msg->line.req.method.name),
+ 			uri);
+ 	} else {
+-		snprintf(line, len, "%-5.5d %-10.10ld %-5.5s %-24.24s SIP/2.0 %u %.*s",
++		snprintf(line, len, "%-5.5d %-10.10" TIME_T_INT_FMT " %-5.5s %-24.24s SIP/2.0 %u %.*s",
+ 			entry->number,
+ 			entry->timestamp.tv_sec,
+ 			entry->transmitted ? "* ==>" : "* <==",
+@@ -1169,7 +1169,7 @@ static void display_single_entry(struct
+ 		pj_sockaddr_print(&entry->src, addr, sizeof(addr), 3);
+ 	}
+ 
+-	ast_cli(a->fd, "<--- History Entry %d %s %s at %-10.10ld --->\n",
++	ast_cli(a->fd, "<--- History Entry %d %s %s at %-10.10" TIME_T_INT_FMT " --->\n",
+ 		entry->number,
+ 		entry->transmitted ? "Sent to" : "Received from",
+ 		addr,
+--- a/res/res_pjsip_pubsub.c
++++ b/res/res_pjsip_pubsub.c
+@@ -4744,7 +4744,7 @@ static int persistence_expires_str2struc
+ static int persistence_expires_struct2str(const void *obj, const intptr_t *args, char **buf)
+ {
+ 	const struct subscription_persistence *persistence = obj;
+-	return (ast_asprintf(buf, "%ld", persistence->expires.tv_sec) < 0) ? -1 : 0;
++	return (ast_asprintf(buf, "%" TIME_T_INT_FMT, persistence->expires.tv_sec) < 0) ? -1 : 0;
+ }
+ 
+ #define RESOURCE_LIST_INIT_SIZE 4
+--- a/res/res_pjsip_registrar.c
++++ b/res/res_pjsip_registrar.c
+@@ -1272,7 +1272,7 @@ static void *check_expiration_thread(voi
+ 	while (check_interval) {
+ 		sleep(check_interval);
+ 
+-		sprintf(time, "%ld", ast_tvnow().tv_sec);
++		sprintf(time, "%" TIME_T_INT_FMT, ast_tvnow().tv_sec);
+ 		var = ast_variable_new("expiration_time <=", time, "");
+ 
+ 		ast_debug(4, "Woke up at %s  Interval: %d\n", time, check_interval);
+--- a/res/res_stir_shaken.c
++++ b/res/res_stir_shaken.c
+@@ -389,7 +389,7 @@ static void set_public_key_expiration(co
+ 		actual_expires.tv_sec += EXPIRATION_BUFFER;
+ 	}
+ 
+-	snprintf(time_buf, sizeof(time_buf), "%30lu", actual_expires.tv_sec);
++	snprintf(time_buf, sizeof(time_buf), "%30" TIME_T_UINT_FMT, actual_expires.tv_sec);
+ 
+ 	ast_db_put(hash, "expiration", time_buf);
+ }