From 5a847bdadf82aef114984f41fa5a57686759ff77 Mon Sep 17 00:00:00 2001
From: Liviu Chircu <liviu@opensips.org>
Date: Tue, 30 Apr 2024 13:53:28 +0300
Subject: [PATCH] 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 dbf794dccad5f2865f955e693c85a65bc5046237)

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

(cherry picked from commit b8fdce475d6c8b7a3df3b2ae1b6d7ec64a053d9c)

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 d7fcd90432494b259b608d5397c6dd2bcdaa3f59)

Fix package typo

(cherry picked from commit 44c995aae67d24f80161096a529ded398bd69c45)
---
 lib/reg/ci.c                                              | 4 ++--
 lib/reg/common.h                                          | 4 ++--
 .../build/{apt_requirements.txt => apt_requirements.sh}   | 8 ++++++--
 scripts/build/install_depends.sh                          | 2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)
 rename scripts/build/{apt_requirements.txt => apt_requirements.sh} (67%)

diff --git a/lib/reg/ci.c b/lib/reg/ci.c
index 23c6a9d129b..6f87098439d 100644
--- a/lib/reg/ci.c
+++ b/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);
 }
diff --git a/lib/reg/common.h b/lib/reg/common.h
index 674460fd85c..c893193ace3 100644
--- a/lib/reg/common.h
+++ b/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;
diff --git a/scripts/build/apt_requirements.txt b/scripts/build/apt_requirements.sh
similarity index 67%
rename from scripts/build/apt_requirements.txt
rename to scripts/build/apt_requirements.sh
index feccd6b9089..f7f59b43f91 100644
--- a/scripts/build/apt_requirements.txt
+++ b/scripts/build/apt_requirements.sh
@@ -1,3 +1,6 @@
+#!/bin/sh
+
+cat <<EOF
 flex
 bison
 make
@@ -5,9 +8,9 @@ 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
diff --git a/scripts/build/install_depends.sh b/scripts/build/install_depends.sh
index a27244e2e1e..7f44f34b22d 100755
--- a/scripts/build/install_depends.sh
+++ b/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