Merge version 3.0.17.4-0+deb11u1+rpi1 and 3.0.18-0+deb11u1 to produce 3.0.18-0+deb11u...

diff --cc debian/changelog
index d0c9cbeaac1a6dfa0280f258bed748ef09286a4d,3e37a8642deb693bde4111a93f065d7f469e7dbd..0387721b106c2842c00082eeb520439c2fa6a4c1
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,11 +1,19 @@@
- vlc (3.0.17.4-0+deb11u1+rpi1) bullseye-staging; urgency=medium
++vlc (3.0.18-0+deb11u1+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 3.0.11.1-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 30 Aug 2020 00:37:35 +0000]
 +  * Add extern to three functions for gcc-10 compatibility.
 +  * Partially fix clean target.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 21 Jun 2022 08:12:23 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 08 Dec 2022 15:53:18 +0000
++
+ vlc (3.0.18-0+deb11u1) bullseye-security; urgency=medium
+ 
+   * New upstream version 3.0.18
+     - Fix buffer overflow in the vnc module (CVE-2022-41325)
+   * debian/: Remove sndio module
+     The sndio version in bullseye is no longer detected.
+ 
+  -- Sebastian Ramacher <sramacher@debian.org>  Fri, 02 Dec 2022 22:08:18 +0100
  
  vlc (3.0.17.4-0+deb11u1) bullseye-security; urgency=medium
  

diff --cc debian/rules
Simple merge