Merge version 5.8.4-1+rpi1 and 5.8.5-1 to produce 5.8.5-1+rpi1

diff --cc debian/changelog
index 01b0bcd5ebd4d22e9f64e0f652641308f7011bdb,4943e796106908110fe8f0fd91b95f9023608413..1b25feb5ac296de2e6c70af429e4d80db7d069f7
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,16 +1,23 @@@
- kamailio (5.8.4-1+rpi1) trixie-staging; urgency=medium
++kamailio (5.8.5-1+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 5.5.3-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 15 Feb 2022 05:45:40 +0000]
 +  * Remove supirious dash before CC_OPT
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 12 Dec 2024 11:05:27 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 06 Feb 2025 03:52:55 +0000
++
+ kamailio (5.8.5-1) unstable; urgency=medium
+ 
+   * New upstream version 5.8.5
+   * upstream fixes from 5.8 branch
+   * pkg-config => pkgconf
+   * Trim trailing whitespace.
+   * Use secure URI in Homepage field.
+   * Update watch file format version to 4.
+   * update lintian-overrides
+   * copyright: remove file patterns no longer there
+   * copyright: update debian/* year
+ 
+  -- Victor Seva <vseva@debian.org>  Tue, 28 Jan 2025 14:06:51 +0100
  
  kamailio (5.8.4-1) unstable; urgency=medium
  

diff --cc debian/patches/series
index 71759aec02afa85e5c2abec0ef3f59552cb3e2c2,fbfae4f058c432a57d62732836f866c5c2e37e53..8aba883a17f3ec10f1edc6ea1518c6fad34ed97b
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -3,4 -3,6 +3,7 @@@ no_lib64_on_64_bits.patc
  no_INSTALL_file.patch
  fix_export.patch
  stop-setting-march-on-arm.patch
+ # upstream fixes from 5.8 branch
+ upstream/0001-db_sqlite-fix-incompatible-pointer-types-warning.patch
+ upstream/0002-db_unixodbc-fix-incompatible-pointer-types-warning.patch
 +remove-supirious-dash.patch

diff --cc src/Makefile.defs
Simple merge