fix 2 extensions with patches from upstream git

Package-Manager: portage-2.1.12.2
Manifest-Sign-Key: C406BA7E