Attempt to fix GitHub Workflow

On newer 22.04 Ubuntu, it seems the ODBC package has been bumped to "2".

Related commits:
    - fa652e8
    - 6bfd7d2

(cherry picked from commit dbf794d)

Fix a bunch of ARM32 printf() warnings (Ubuntu 22.04)

(cherry picked from commit b8fdce4)

Attempt #2 to fix GitHub Workflow

Previous commit fixed 22.04 but broke 20.04, so this commit should make
both work.

(cherry picked from commit d7fcd90)

Fix package typo

(cherry picked from commit 44c995a)

lib/reg/ci.c

@@ -214,7 +214,7 @@ void print_ci(ucontact_info_t *ci)
 	LM_DBG(" ----- UCI DUMP (%p) ------\n", ci);
 	LM_DBG("received: %.*s, path: %.*s\n", ci->received.len, ci->received.s,
 	       ci->path ? ci->path->len : 0, ci->path ? ci->path->s : NULL);
-	LM_DBG("expires: %ld, expires_in: %ld, expires_out: %ld\n", ci->expires,
+	LM_DBG("expires: %lld, expires_in: %ld, expires_out: %ld\n", (long long)ci->expires,
 	       ci->expires_in, ci->expires_out);
 	LM_DBG("q: %d, instance: %.*s, callid: %.*s\n", ci->q, ci->instance.len,
 	       ci->instance.s, ci->callid ? ci->callid->len : 0,
@@ -224,6 +224,6 @@ void print_ci(ucontact_info_t *ci)
 	LM_DBG("user_agent: %.*s, sock: %p, methods: %d\n",
 	       ci->user_agent ? ci->user_agent->len : 0,
 	       ci->user_agent ? ci->user_agent->s : NULL, ci->sock, ci->methods);
-	LM_DBG("last_modified: %ld, attr: %.*s\n", ci->last_modified,
+	LM_DBG("last_modified: %lld, attr: %.*s\n", (long long)ci->last_modified,
 	       ci->attr ? ci->attr->len : 0, ci->attr ? ci->attr->s : NULL);
 }

lib/reg/common.h

@@ -84,8 +84,8 @@ static inline time_t randomize_expires(unsigned int expires_ts)
 		expires_dur = max_expires;
 
 	ret = expires_dur + get_act_time();
-	LM_DBG("randomized expiry ts from %u to %lu (adj: %d/%d, "
-	       "max_deviation: %d)\n", expires_ts, ret, expires_adj,
+	LM_DBG("randomized expiry ts from %u to %lld (adj: %d/%d, "
+	       "max_deviation: %d)\n", expires_ts, (long long)ret, expires_adj,
 	       (int)ret - (int)expires_ts, expires_max_deviation);
 
 	return ret;

scripts/build/apt_requirements.txt → scripts/build/apt_requirements.sh

@@ -1,13 +1,16 @@
+#!/bin/sh
+
+cat <<EOF
 flex
 bison
 make
 libsqlite3-dev
 libsctp-dev
 libradcli-dev
 libhiredis-dev
-libodbc1
+$(if [ "$BUILD_OS" != "ubuntu-20.04" ]; then echo libodbc2; else echo libodbc1; fi)
 odbcinst
-odbcinst1debian2
+$(if [ "$BUILD_OS" != "ubuntu-20.04" ]; then echo libodbcinst2; else echo odbcinst1debian2; fi)
 unixodbc
 unixodbc-dev
 libconfuse-dev
@@ -33,3 +36,4 @@ uuid-dev
 python-dev
 libmaxminddb-dev
 patch
+EOF

scripts/build/install_depends.sh

@@ -4,7 +4,7 @@ set -e
 
 . $(dirname $0)/dockerize.sub
 
-PKGS="`cat "$(dirname $0)/apt_requirements.txt"`"
+PKGS=$(. "$(dirname $0)/apt_requirements.sh")
 
 . $(dirname $0)/build.conf.sub