Small tweaks

Patches/LineageOS-18.1/android_device_htc_msm8974-common/312412.patch

@@ -1,33 +0,0 @@
-From bf409d1c39b7f880db5bcc7e417f6ac9d6cbecf0 Mon Sep 17 00:00:00 2001
-From: Bruno Martins <bgcngm@gmail.com>
-Date: Mon, 14 Jun 2021 15:21:28 +0100
-Subject: [PATCH] msm8974-common: Extend RIL shim to all variants
-
-Commit edfa6c3 missed to account for VZW and SPR variants.
-
-Change-Id: I3cc0a885c11670cb67a33f5272d23cea41e0ec13
----
- BoardConfigCommon.mk | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
-index 5fad8c7f..647eab89 100644
---- a/BoardConfigCommon.mk
-+++ b/BoardConfigCommon.mk
-@@ -1,6 +1,6 @@
- #
- # Copyright (C) 2015-2016 The CyanogenMod Project
--#               2017-2020 The LineageOS Project
-+#               2017-2021 The LineageOS Project
- #
- # Licensed under the Apache License, Version 2.0 (the "License");
- # you may not use this file except in compliance with the License.
-@@ -131,6 +131,8 @@ BOARD_SEPOLICY_DIRS += $(PLATFORM_PATH)/sepolicy
- TARGET_LD_SHIM_LIBS := \
-     /system/lib/liblog.so|liblog_htc.so \
-     /system/vendor/lib/hw/camera.vendor.msm8974.so|libshim_camera.so \
-+    /system/vendor/lib/libril_vzw-qc-qmi-1.so|libshim_ril.so \
-+    /system/vendor/lib/libril_spr-qc-qmi-1.so|libshim_ril.so \
-     /system/vendor/lib/libril-qc-qmi-1.so|libshim_ril.so
- 
- # Wifi

Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_essential_msm8998.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 cd "$DOS_BUILD_BASE""kernel/essential/msm8998"
-git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0274-0275.patch --exclude=Makefile
 git apply $DOS_PATCHES_LINUX_CVES/0007-Accelerated_AES/3.10+/0016.patch
 git apply $DOS_PATCHES_LINUX_CVES/0007-Accelerated_AES/3.10+/0020.patch
 git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0002.patch
@@ -99,7 +98,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/^5.6.1/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14386/3.10-^4.4/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1955/ANY/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3609/4.4/0006.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/4.4/0004.patch
-editKernelLocalversion "-dos.p101"
+editKernelLocalversion "-dos.p98"
 cd "$DOS_BUILD_BASE"

Scripts/LineageOS-18.1/Patch.sh

@@ -301,10 +301,6 @@ if enterAndClear "device/htc/m8-common"; then
 awk -i inplace '!/TARGET_RELEASETOOLS_EXTENSIONS/' BoardConfigCommon.mk; #broken releasetools
 fi;
 
-if enterAndClear "device/htc/msm8974-common"; then
-patch -p1 < "$DOS_PATCHES/android_device_htc_msm8974-common/312412.patch"; #shim all the rils
-fi;
-
 if enterAndClear "device/lge/g2-common"; then
 sed -i '3itypeattribute hwaddrs misc_block_device_exception;' sepolicy/hwaddrs.te;
 awk -i inplace '!/TARGET_RELEASETOOLS_EXTENSIONS/' BoardConfigCommon.mk; #broken releasetools

Scripts/init.sh

@@ -61,7 +61,7 @@ export DOS_MICROG_INCLUDED="NLP"; #Determines inclusion of microG. Options: NLP,
 export DOS_NON_COMMERCIAL_USE_PATCHES=false; #Set true to allow inclusion of non-commercial use patches XXX: Unused, see 1dc9247
 export DOS_OPTIMIZE_IMAGES=false; #Set true to apply lossless optimizations to image resources
 export DOS_STRONG_ENCRYPTION_ENABLED=false; #Set true to enable AES 256-bit FDE encryption on 14.1+15.1 XXX: THIS WILL **DESTROY** EXISTING INSTALLS!
-alias DOS_WEBVIEW_CHERRYPICK='git pull "https://github.com/LineageOS/android_external_chromium-webview" refs/changes/60/312860/3';
+alias DOS_WEBVIEW_CHERRYPICK='git pull "https://github.com/LineageOS/android_external_chromium-webview" refs/changes/82/313782/2';
 
 #Servers
 export DOS_DEFAULT_DNS_PRESET="Quad9"; #Sets default DNS. Options: See changeDefaultDNS() in Scripts/Common/Functions.sh