Browse Source

Update to 88.0.4324.152; split webview builds

tags/88.0.4324.152-1-webview^0 88.0.4324.152-1-webview
wchen342 7 months ago
parent
commit
ff0d9d10bd
Signed by: wchen342 GPG Key ID: 9C19365D69B04CEC
5 changed files with 53 additions and 7 deletions
  1. +30
    -0
      .github/workflows/build-webview.yml
  2. +2
    -1
      .github/workflows/build.yml
  3. +2
    -1
      .github/workflows/dispatch-request.sh
  4. +12
    -1
      CHANGELOG.md
  5. +7
    -4
      build.sh

+ 30
- 0
.github/workflows/build-webview.yml View File

@ -0,0 +1,30 @@
name: Ungoogled-chromium-android-webview-build-dispatch
on:
workflow_run:
workflows: [ "Ungoogled-chromium-android-build-dispatch" ]
branches: [ master ]
types:
- completed
push:
tags:
- '[0-9]+.[0-9]+.[0-9]+.[0-9]+-[0-9]+-webview'
jobs:
build:
name: Send workflow dispatch to runner repo
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected]
- name: Send build request
env:
PAT_USERNAME: ${{ secrets.PAT_USERNAME }}
PAT_TOKEN: ${{ secrets.PAT_TOKEN }}
REPO_USERNAME: ${{ secrets.REPO_USERNAME }}
REPO_NAME: ${{ secrets.REPO_NAME }}
GITHUB_REF: ${{ github.ref }}
GITHUB_SHA: ${{ github.sha }}
WORKFLOW_NAME: "build-webview"
run: |
sleep 30
.github/workflows/dispatch-request.sh

+ 2
- 1
.github/workflows/build.yml View File

@ -1,4 +1,4 @@
name: Ungoogled-chromium-android build dispatch
name: Ungoogled-chromium-android-build-dispatch
on:
push:
tags:
@ -19,5 +19,6 @@ jobs:
REPO_NAME: ${{ secrets.REPO_NAME }}
GITHUB_REF: ${{ github.ref }}
GITHUB_SHA: ${{ github.sha }}
WORKFLOW_NAME: "build"
run: |
.github/workflows/dispatch-request.sh

+ 2
- 1
.github/workflows/dispatch-request.sh View File

@ -9,8 +9,9 @@ data='{'\
' }'\
'}'
# Chromium build request
curl -X POST \
-H "Accept: application/vnd.github.v3+json" \
-H "Authorization: token ${PAT_TOKEN}" \
https://api.github.com/repos/"${REPO_USERNAME}"/"${REPO_NAME}"/actions/workflows/build.yml/dispatches \
https://api.github.com/repos/"${REPO_USERNAME}"/"${REPO_NAME}"/actions/workflows/"${WORKFLOW_NAME}".yml/dispatches \
-d "${data}"

+ 12
- 1
CHANGELOG.md View File

@ -1,5 +1,16 @@
# 88.0.4324.152-1
* Upstream important security fix
* [1170176] High CVE-2021-21148: Heap buffer overflow in V8. Reported by Mattias Buelens on 2021-01-24
* Due to increasing problems with webview and build time, I will now release the main browser and webviews separately. In case of any problems occur with the builds, the main browser will take precedence.
# 88.0.4324.146-1
* Upstream update
* Upstream important security fix
* [1169317] Critical CVE-2021-21142: Use after free in Payments . Reported by Khalil Zhani on 2021-01-21
* [1163504] High CVE-2021-21143: Heap buffer overflow in Extensions. Reported by Allen Parker & Alex Morgan of MU on 2021-01-06
* [1163845] High CVE-2021-21144: Heap buffer overflow in Tab Groups. Reported by Leecraso and Guang Gong of 360 Alpha Lab on 2021-01-07
* [1154965] High CVE-2021-21145: Use after free in Fonts. Reported by Anonymous on 2020-12-03
* [1161705] High CVE-2021-21146: Use after free in Navigation. Reported by Alison Huffman and Choongwoo Han of Microsoft Browser Vulnerability Research on 2020-12-24
* [1162942] Medium CVE-2021-21147: Inappropriate implementation in Skia. Reported by Roman Starkov on 2021-01-04
* Fix webview build
# 88.0.4324.104-1


+ 7
- 4
build.sh View File

@ -9,8 +9,10 @@ chrome_modern_target=chrome_modern_public_bundle
trichrome_chrome_bundle_target=trichrome_chrome_bundle
trichrome_chrome_apk_target=trichrome_library_apk
webview_target=system_webview_apk
trichrome_webview_target=trichrome_webview_apk
chromium_version=88.0.4324.146
chromium_version=88.0.4324.152
ungoogled_chromium_version=88.0.4324.146
ungoogled_chromium_revision=1
# Show env
@ -78,7 +80,7 @@ if [[ "$ARCH" != "arm64" ]] && [[ "$ARCH" != "arm" ]] && [[ "$ARCH" != "x86" ]];
exit 4
fi
if [[ "$TARGET" != "$chrome_modern_target" ]] && [[ "$TARGET" != "$trichrome_chrome_bundle_target" ]] && [[ "$TARGET" != "$webview_target" ]] && [[ "$TARGET" != "all" ]]; then
if [[ "$TARGET" != "$chrome_modern_target" ]] && [[ "$TARGET" != "$trichrome_chrome_bundle_target" ]] && [[ "$TARGET" != "$webview_target" ]] && [[ "$TARGET" != "$trichrome_webview_target" ]] && [[ "$TARGET" != "all" ]]; then
echo "Wrong target"
exit 5
fi
@ -104,7 +106,7 @@ function prepare_repos {
patch_applied=false
## Clone ungoogled-chromium repo
git clone https://github.com/Eloston/ungoogled-chromium.git -b ${chromium_version}-${ungoogled_chromium_revision} || return $?
git clone https://github.com/Eloston/ungoogled-chromium.git -b ${ungoogled_chromium_version}-${ungoogled_chromium_revision} || return $?
## Clone chromium repo
git clone --depth 1 --no-tags https://chromium.googlesource.com/chromium/src.git -b ${chromium_version} || return $?
@ -169,7 +171,7 @@ function prepare_repos {
ln -s /usr/bin/javac src/third_party/jdk/current/bin/
ln -s /usr/bin/javap src/third_party/jdk/current/bin/
mkdir -p src/third_party/jdk/current/lib
ln -s /usr/lib/jvm/java-11-openjdk-11.0.9.11-9.fc33.x86_64/lib/jrt-fs.jar src/third_party/jdk/current/lib/
ln -s $(find /usr/lib/jvm -type d -iname 'java-11-openjdk-*.x86_64')/lib/jrt-fs.jar src/third_party/jdk/current/lib/
# jre
mkdir -p src/third_party/jdk/extras/java_8 && pushd src/third_party/jdk/extras/java_8
ln -s /usr/lib/jvm/jre-1.8.0 jre
@ -348,6 +350,7 @@ else
ninja -C out/Default "$chrome_modern_target"
../bundle_generate_apk.sh -o "${output_folder}" -t "$chrome_modern_target"
ninja -C out/Default "$webview_target"
ninja -C out/Default "$trichrome_webview_target"
find . -iname "*.apk" -exec cp -f {} ../"${apk_out_folder}" \;
# arm64+TriChrome needs to be run separately, otherwise it will fail


Loading…
Cancel
Save