This is on track to replace libupnp in the next version. Since libupnp
is not building with GCC10, do this now.

Also backported needed header patch.

Replace other patches with the upstream versions.

Signed-off-by: Rosen Penev <rosenp@gmail.com>