Merge branch '4086' into 'master'

Update Blokada to v4.8.6

See merge request fdroid/fdroiddata!7680

metadata/org.blokada.alarm.yml

@@ -4,10 +4,10 @@ License: GPL-3.0-only
 AuthorName: The Blokada Community
 AuthorEmail: hello@blokada.org
 WebSite: https://blokada.org
-SourceCode: https://github.com/blokadaorg/blokada
+SourceCode: https://go.blokada.org/dev_home
 IssueTracker: https://github.com/blokadaorg/blokada/issues
-Changelog: https://blokada.org/docs/changelog.html
-Donate: https://blokada.org/docs/donate.html
+Changelog: https://go.blokada.org/changelog
+Donate: https://go.blokada.org/donate
 Bitcoin: 16rJ49uNKCohVhHvWNganP6Y48Ba9BTyKd
 
 Name: Blokada v4 (ad blocker)
@@ -553,7 +553,33 @@ Builds:
       - ./build.sh
     ndk: r20b
 
+  - versionName: 4.8.6
+    versionCode: 408000006
+    commit: 4.8.6
+    subdir: app
+    gradle:
+      - Community
+    srclibs:
+      - rustup@1.18.3
+    rm:
+      - app/src/tun-blocka/jniLibs
+    prebuild: sed -i -e '/set -e/a\source $HOME/.cargo.env' ../boringtun/build.sh
+    build:
+      - $$rustup$$/rustup-init.sh -y
+      - source $HOME/.cargo/env
+      - rustup default 1.36.0
+      - rustup target add armv7-linux-androideabi
+      - rustup target add aarch64-linux-android
+      - rustup target add i686-linux-android
+      - rustup target add x86_64-linux-android
+      - export NDK_STANDALONE=$$NDK$$
+      - sed -i -e "s|/Users/kar/Library/Android/sdk/ndk-bundle|$$NDK$$|" ../boringtun/.cargo/config
+      - sed -i -e "s|darwin|linux|" ../boringtun/.cargo/config
+      - cd ../boringtun/
+      - ./build.sh
+    ndk: r20b
+
 AutoUpdateMode: None
 UpdateCheckMode: Tags
-CurrentVersion: 4.8.5
-CurrentVersionCode: 408000005
+CurrentVersion: 4.8.6
+CurrentVersionCode: 408000006