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

diff --cc debian/changelog
index 228208017467f8e1edf11c71c5a26562a31e6cbc,0f324766036e3f246cfab23bf3736879d37865f9..01b0bcd5ebd4d22e9f64e0f652641308f7011bdb
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,16 @@@
- kamailio (5.8.3-1+rpi1) trixie-staging; urgency=medium
++kamailio (5.8.4-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>  Sat, 19 Oct 2024 03:28:13 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 12 Dec 2024 11:05:27 +0000
++
+ kamailio (5.8.4-1) unstable; urgency=medium
+ 
+   * New upstream version 5.8.4
+   * remove already applied patches
+ 
+  -- Victor Seva <vseva@debian.org>  Fri, 15 Nov 2024 19:55:10 +0100
  
  kamailio (5.8.3-1) unstable; urgency=medium
  

diff --cc debian/patches/series
index 9d694b7cf4905dfbe02a7740934d24eb0ea33e4a,22f712d9a314c660c049b5db4f288c5d907de338..71759aec02afa85e5c2abec0ef3f59552cb3e2c2
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -3,8 -3,3 +3,4 @@@ no_lib64_on_64_bits.patc
  no_INSTALL_file.patch
  fix_export.patch
  stop-setting-march-on-arm.patch
- # upstream fixes from 5.8
- nathelper-check-if-alias-ipv6-has-already-square-bra.patch
- nathelper-add_contact_alias-with-parameters-to-enclo.patch
- tm-remove-extra-used-before-MAXFWD_HEADER_LEN.patch
 +remove-supirious-dash.patch

diff --cc src/Makefile.defs
Simple merge