From 0cfa7c6bfdfaaf48d63d48ec95d5967a9caa070b Mon Sep 17 00:00:00 2001 From: IratePorcupine <3669023-IratePorcupine@users.noreply.gitlab.com> Date: Tue, 29 Oct 2024 13:16:52 +0000 Subject: [PATCH] Fennec and Mull: Update to 132.0.0 --- metadata/org.mozilla.fennec_fdroid.yml | 66 +++++++++++++++++++++++--- metadata/us.spotco.fennec_dos.yml | 62 ++++++++++++++++++++++-- srclibs/llvm.yml | 2 + srclibs/llvm_android.yml | 2 + srclibs/toolchain-utils.yml | 2 + 5 files changed, 122 insertions(+), 12 deletions(-) create mode 100644 srclibs/llvm.yml create mode 100644 srclibs/llvm_android.yml create mode 100644 srclibs/toolchain-utils.yml diff --git a/metadata/org.mozilla.fennec_fdroid.yml b/metadata/org.mozilla.fennec_fdroid.yml index 6cf7be5853..a5f53f47fb 100644 --- a/metadata/org.mozilla.fennec_fdroid.yml +++ b/metadata/org.mozilla.fennec_fdroid.yml @@ -3,8 +3,6 @@ AntiFeatures: en-US: Connects to various Mozilla services that can track users. UpstreamNonFree: en-US: Telemetry and proprietary bits are removed by F-Droid builds. - KnownVuln: - en-US: Firefox has fixed several security vulnerabilities since 130. Categories: - Internet License: MPL-2.0 @@ -15565,6 +15563,58 @@ Builds: build: ./build.sh ndk: 26.2.11394342 + - versionName: 132.0.0 + versionCode: 1320000 + commit: 7b2763f2e96116b0a712b5f075ff97637506c9fc + timeout: 18000 + sudo: + - echo "deb https://deb.debian.org/debian trixie main" > /etc/apt/sources.list.d/trixie.list + - apt-get update + - apt-get install -y -t trixie clang-18 llvm-18 lld-18 libssl-dev + - apt-get install -y -t bookworm cmake make m4 g++ pkg-config python-is-python3 + python3-distutils python3-venv tcl gyp ninja-build bzip2 libz-dev libffi-dev + libsqlite3-dev binutils-dev + output: ../srclib/MozFennec/mobile/android/fenix/app/build/outputs/apk/fenix/release/app-*-release-unsigned.apk + srclibs: + - MozFennec@FIREFOX_132_0_BUILD1 + - MozAppServices@50d90349a4af01553c3e228ef28cbfc46eb8d314 + - MozGlean@v61.2.0 + - gmscore@v0.3.2.240913 + - rustup@1.27.1 + - wasi-sdk@wasi-sdk-20 + - llvm@3c92011b600bdf70424e2547594dd461fe411a41 + - llvm_android@2a4ee244d6dd0dcb8365590b898f7a40ec3cb87a + - toolchain-utils@760c253c1ed00ce9abd48f8546f08516e57485fe + prebuild: ./prebuild.sh $$VERSION$$ $$VERCODE$$ + build: ./build.sh + ndk: 27.1.12297006 + + - versionName: 132.0.0 + versionCode: 1320020 + commit: 7b2763f2e96116b0a712b5f075ff97637506c9fc + timeout: 18000 + sudo: + - echo "deb https://deb.debian.org/debian trixie main" > /etc/apt/sources.list.d/trixie.list + - apt-get update + - apt-get install -y -t trixie clang-18 llvm-18 lld-18 libssl-dev + - apt-get install -y -t bookworm cmake make m4 g++ pkg-config python-is-python3 + python3-distutils python3-venv tcl gyp ninja-build bzip2 libz-dev libffi-dev + libsqlite3-dev binutils-dev + output: ../srclib/MozFennec/mobile/android/fenix/app/build/outputs/apk/fenix/release/app-*-release-unsigned.apk + srclibs: + - MozFennec@FIREFOX_132_0_BUILD1 + - MozAppServices@50d90349a4af01553c3e228ef28cbfc46eb8d314 + - MozGlean@v61.2.0 + - gmscore@v0.3.2.240913 + - rustup@1.27.1 + - wasi-sdk@wasi-sdk-20 + - llvm@3c92011b600bdf70424e2547594dd461fe411a41 + - llvm_android@2a4ee244d6dd0dcb8365590b898f7a40ec3cb87a + - toolchain-utils@760c253c1ed00ce9abd48f8546f08516e57485fe + prebuild: ./prebuild.sh $$VERSION$$ $$VERCODE$$ + build: ./build.sh + ndk: 27.1.12297006 + MaintainerNotes: |- Version code scheme: XYZAR, where X.Y.Z is upstream version, A is architecture (0 = ARMv7, 1 = x86, 2 = ARMv8), R is revision (if we need to re-release). @@ -15578,9 +15628,6 @@ MaintainerNotes: |- grep 'VERSION =' build/srclib/MozFennec/mobile/android/android-components/plugins/dependencies/src/main/java/ApplicationServices.kt grep 'mozilla_glean =' build/srclib/MozFennec/mobile/android/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt - MozGleanAS version: - grep '^glean =' build/srclib/MozAppServices/gradle/libs.versions.toml - wasi-sdk version: grep -A5 '^wasi-sdk:' build/srclib/MozFennec/taskcluster/kinds/fetch/toolchains.yml @@ -15588,10 +15635,15 @@ MaintainerNotes: |- * https://github.com/rust-lang/rustup/tags * https://firefox-source-docs.mozilla.org/writing-rust-code/update-policy.html#schedule + ndk versions: + * https://hg.mozilla.org/releases/mozilla-release/file/$tag/python/mozboot/mozboot/android.py + * https://android.googlesource.com/toolchain/llvm_android.git/+refs + * https://android.googlesource.com/platform/external/toolchain-utils.git/+log/refs/heads/main + Scanner detects 'com/google/firebase/messaging/FirebaseMessagingService' from stubs and 'com/google/android/gms/...' from microG libs for webauth ArchivePolicy: 6 AutoUpdateMode: None UpdateCheckMode: None -CurrentVersion: 129.0.2 -CurrentVersionCode: 1290220 +CurrentVersion: 132.0.0 +CurrentVersionCode: 1320020 diff --git a/metadata/us.spotco.fennec_dos.yml b/metadata/us.spotco.fennec_dos.yml index 40a3a1782b..40a0bff746 100644 --- a/metadata/us.spotco.fennec_dos.yml +++ b/metadata/us.spotco.fennec_dos.yml @@ -1,8 +1,6 @@ AntiFeatures: UpstreamNonFree: en-US: Telemetry and proprietary bits are removed. - KnownVuln: - en-US: Firefox has fixed several security vulnerabilities since 130. Categories: - Internet License: MPL-2.0 @@ -3957,6 +3955,58 @@ Builds: build: ./build.sh ndk: 26.2.11394342 + - versionName: 132.0.0 + versionCode: 21320000 + commit: v132.0.0 + timeout: 18000 + sudo: + - echo "deb https://deb.debian.org/debian trixie main" > /etc/apt/sources.list.d/trixie.list + - apt-get update + - apt-get install -y -t trixie clang-18 llvm-18 lld-18 libssl-dev + - apt-get install -y -t bookworm cmake make m4 g++ pkg-config python-is-python3 + python3-distutils python3-venv tcl gyp ninja-build bzip2 libz-dev libffi-dev + libsqlite3-dev binutils-dev + output: ../srclib/MozFennec/mobile/android/fenix/app/build/outputs/apk/fenix/release/app-*-release-unsigned.apk + srclibs: + - MozFennec@FIREFOX_132_0_BUILD1 + - MozAppServices@50d90349a4af01553c3e228ef28cbfc46eb8d314 + - MozGlean@v61.2.0 + - gmscore@v0.3.2.240913 + - rustup@1.27.1 + - wasi-sdk@wasi-sdk-20 + - llvm@3c92011b600bdf70424e2547594dd461fe411a41 + - llvm_android@2a4ee244d6dd0dcb8365590b898f7a40ec3cb87a + - toolchain-utils@760c253c1ed00ce9abd48f8546f08516e57485fe + prebuild: ./prebuild.sh $$VERSION$$ $$VERCODE$$ + build: ./build.sh + ndk: 27.1.12297006 + + - versionName: 132.0.0 + versionCode: 21320020 + commit: v132.0.0 + timeout: 18000 + sudo: + - echo "deb https://deb.debian.org/debian trixie main" > /etc/apt/sources.list.d/trixie.list + - apt-get update + - apt-get install -y -t trixie clang-18 llvm-18 lld-18 libssl-dev + - apt-get install -y -t bookworm cmake make m4 g++ pkg-config python-is-python3 + python3-distutils python3-venv tcl gyp ninja-build bzip2 libz-dev libffi-dev + libsqlite3-dev binutils-dev + output: ../srclib/MozFennec/mobile/android/fenix/app/build/outputs/apk/fenix/release/app-*-release-unsigned.apk + srclibs: + - MozFennec@FIREFOX_132_0_BUILD1 + - MozAppServices@50d90349a4af01553c3e228ef28cbfc46eb8d314 + - MozGlean@v61.2.0 + - gmscore@v0.3.2.240913 + - rustup@1.27.1 + - wasi-sdk@wasi-sdk-20 + - llvm@3c92011b600bdf70424e2547594dd461fe411a41 + - llvm_android@2a4ee244d6dd0dcb8365590b898f7a40ec3cb87a + - toolchain-utils@760c253c1ed00ce9abd48f8546f08516e57485fe + prebuild: ./prebuild.sh $$VERSION$$ $$VERCODE$$ + build: ./build.sh + ndk: 27.1.12297006 + MaintainerNotes: |- Version code scheme: XYZAR, where X.Y.Z is upstream version, A is architecture (0 = ARMv7, 1 = x86, 2 = ARMv8), R is revision (if we need to re-release). @@ -3967,14 +4017,16 @@ MaintainerNotes: |- * MozFennec: https://hg.mozilla.org/releases/mozilla-release/tags * MozAppServices: `VERSION` in https://hg.mozilla.org/releases/mozilla-release/file/$tag/mobile/android/android-components/plugins/dependencies/src/main/java/ApplicationServices.kt * MozGlean: `mozilla_glean` in https://hg.mozilla.org/releases/mozilla-release/file/$tag/mobile/android/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt - * MozGleanAS: `mozilla_glean` in https://hg.mozilla.org/releases/mozilla-release/file/$MozAndroidComponentsAS/mobile/android/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt * rustup: https://github.com/rust-lang/rustup/tags * wasi-sdk: https://github.com/WebAssembly/wasi-sdk/releases + * ndk: https://hg.mozilla.org/releases/mozilla-release/file/$tag/python/mozboot/mozboot/android.py + * llvm_android: https://android.googlesource.com/toolchain/llvm_android.git/+refs + * toolchain-utils: https://android.googlesource.com/platform/external/toolchain-utils.git/+log/refs/heads/main Scanner detects 'com/google/firebase/messaging/FirebaseMessagingService' from stubs and 'com/google/android/gms/...' from microG libs for webauth ArchivePolicy: 6 AutoUpdateMode: None UpdateCheckMode: None -CurrentVersion: 129.0.2 -CurrentVersionCode: 21290220 +CurrentVersion: 132.0.0 +CurrentVersionCode: 21320020 diff --git a/srclibs/llvm.yml b/srclibs/llvm.yml new file mode 100644 index 0000000000..a83c149763 --- /dev/null +++ b/srclibs/llvm.yml @@ -0,0 +1,2 @@ +RepoType: git +Repo: https://github.com/llvm/llvm-project.git diff --git a/srclibs/llvm_android.yml b/srclibs/llvm_android.yml new file mode 100644 index 0000000000..866a76035c --- /dev/null +++ b/srclibs/llvm_android.yml @@ -0,0 +1,2 @@ +RepoType: git +Repo: https://android.googlesource.com/toolchain/llvm_android.git diff --git a/srclibs/toolchain-utils.yml b/srclibs/toolchain-utils.yml new file mode 100644 index 0000000000..941c546495 --- /dev/null +++ b/srclibs/toolchain-utils.yml @@ -0,0 +1,2 @@ +RepoType: git +Repo: https://android.googlesource.com/platform/external/toolchain-utils.git