diff --git a/Patches/LineageOS-18.1/android_frameworks_base/0012-Private_DNS.patch b/Patches/LineageOS-18.1/android_frameworks_base/0012-Private_DNS.patch index cb1958d3..ac6fd786 100644 --- a/Patches/LineageOS-18.1/android_frameworks_base/0012-Private_DNS.patch +++ b/Patches/LineageOS-18.1/android_frameworks_base/0012-Private_DNS.patch @@ -21,7 +21,7 @@ Change-Id: Id75a774ce1ed109a83c6a5bf512536c643165d71 2 files changed, 170 insertions(+) diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java -index ed03f5198d6f..7df32c10b16b 100644 +index ed03f5198d6f..dfdbbe085c0f 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -796,6 +796,58 @@ public class ConnectivityManager { diff --git a/Patches/LineageOS-18.1/android_frameworks_base/0013-Network_Permission-6.patch b/Patches/LineageOS-18.1/android_frameworks_base/0013-Network_Permission-6.patch index b1601b1f..6675234d 100644 --- a/Patches/LineageOS-18.1/android_frameworks_base/0013-Network_Permission-6.patch +++ b/Patches/LineageOS-18.1/android_frameworks_base/0013-Network_Permission-6.patch @@ -8,7 +8,7 @@ Subject: [PATCH] skip reportNetworkConnectivity() when permission is revoked 1 file changed, 8 insertions(+) diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java -index 7df32c10b16b..a2b04f3e9540 100644 +index dfdbbe085c0f..dc1b4f16feba 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -17,6 +17,7 @@ package android.net; diff --git a/Patches/LineageOS-18.1/android_packages_apps_Settings/0001-Captive_Portal_Toggle-gos.patch b/Patches/LineageOS-18.1/android_packages_apps_Settings/0001-Captive_Portal_Toggle-gos.patch index 2edc5b4b..675c051f 100644 --- a/Patches/LineageOS-18.1/android_packages_apps_Settings/0001-Captive_Portal_Toggle-gos.patch +++ b/Patches/LineageOS-18.1/android_packages_apps_Settings/0001-Captive_Portal_Toggle-gos.patch @@ -68,7 +68,7 @@ index 617548cadc..e1976fb5cf 100644 These are shown in a list dialog. --> diff --git a/res/values/strings.xml b/res/values/strings.xml -index 0c6fe1a541..0173a8bf31 100644 +index a7a338ed7a..8d8e7aaccd 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -12237,4 +12237,7 @@ diff --git a/Patches/LineageOS-18.1/android_packages_apps_Settings/0005-Automatic_Reboot.patch b/Patches/LineageOS-18.1/android_packages_apps_Settings/0005-Automatic_Reboot.patch index a7ccbd59..85307965 100644 --- a/Patches/LineageOS-18.1/android_packages_apps_Settings/0005-Automatic_Reboot.patch +++ b/Patches/LineageOS-18.1/android_packages_apps_Settings/0005-Automatic_Reboot.patch @@ -55,7 +55,7 @@ index e1976fb5cf..4c45ded7fa 100644 Small Default diff --git a/res/values/strings.xml b/res/values/strings.xml -index 0173a8bf31..3d9a6548fc 100644 +index 8d8e7aaccd..21e752e0e2 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -647,6 +647,9 @@ diff --git a/Patches/LineageOS-18.1/android_packages_apps_Settings/0006-Bluetooth_Timeout.patch b/Patches/LineageOS-18.1/android_packages_apps_Settings/0006-Bluetooth_Timeout.patch index 81296b2c..9385844b 100644 --- a/Patches/LineageOS-18.1/android_packages_apps_Settings/0006-Bluetooth_Timeout.patch +++ b/Patches/LineageOS-18.1/android_packages_apps_Settings/0006-Bluetooth_Timeout.patch @@ -67,7 +67,7 @@ index 4c45ded7fa..a36f468bfc 100644 15 seconds diff --git a/res/values/strings.xml b/res/values/strings.xml -index 3d9a6548fc..773e7ffa68 100644 +index 21e752e0e2..25121ea49f 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -27,6 +27,25 @@ diff --git a/Patches/LineageOS-18.1/android_packages_apps_Settings/0007-WiFi_Timeout.patch b/Patches/LineageOS-18.1/android_packages_apps_Settings/0007-WiFi_Timeout.patch index 7de25fa0..9fb57d00 100644 --- a/Patches/LineageOS-18.1/android_packages_apps_Settings/0007-WiFi_Timeout.patch +++ b/Patches/LineageOS-18.1/android_packages_apps_Settings/0007-WiFi_Timeout.patch @@ -67,7 +67,7 @@ index a36f468bfc..83345cbceb 100644 15 seconds diff --git a/res/values/strings.xml b/res/values/strings.xml -index 773e7ffa68..278b6ace5e 100644 +index 25121ea49f..b3408ee49a 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -46,6 +46,25 @@ diff --git a/Patches/LineageOS-18.1/android_packages_apps_Settings/0008-ptrace_scope.patch b/Patches/LineageOS-18.1/android_packages_apps_Settings/0008-ptrace_scope.patch index cb897f30..f57e4e95 100644 --- a/Patches/LineageOS-18.1/android_packages_apps_Settings/0008-ptrace_scope.patch +++ b/Patches/LineageOS-18.1/android_packages_apps_Settings/0008-ptrace_scope.patch @@ -12,7 +12,7 @@ Subject: [PATCH] add native debugging setting create mode 100644 src/com/android/settings/security/NativeDebugPreferenceController.java diff --git a/res/values/strings.xml b/res/values/strings.xml -index 278b6ace5e..dd813f1784 100644 +index b3408ee49a..26ad0e54b2 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -11957,6 +11957,9 @@ diff --git a/Patches/LineageOS-18.1/android_packages_apps_Settings/0009-Install_Restrictions.patch b/Patches/LineageOS-18.1/android_packages_apps_Settings/0009-Install_Restrictions.patch index 9f81728a..8401a606 100644 --- a/Patches/LineageOS-18.1/android_packages_apps_Settings/0009-Install_Restrictions.patch +++ b/Patches/LineageOS-18.1/android_packages_apps_Settings/0009-Install_Restrictions.patch @@ -10,7 +10,7 @@ Subject: [PATCH] UserManager app installation restrictions 3 files changed, 44 insertions(+), 5 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml -index 4ea24ec62e..a2c18d6cea 100644 +index d7f32ee319..d723977899 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -7088,6 +7088,8 @@ diff --git a/Patches/LineageOS-18.1/android_packages_apps_Settings/0010-exec_spawning_toggle.patch b/Patches/LineageOS-18.1/android_packages_apps_Settings/0010-exec_spawning_toggle.patch index 3996b0be..68609d73 100644 --- a/Patches/LineageOS-18.1/android_packages_apps_Settings/0010-exec_spawning_toggle.patch +++ b/Patches/LineageOS-18.1/android_packages_apps_Settings/0010-exec_spawning_toggle.patch @@ -12,7 +12,7 @@ Subject: [PATCH] add exec spawning toggle create mode 100644 src/com/android/settings/security/ExecSpawnPreferenceController.java diff --git a/res/values/strings.xml b/res/values/strings.xml -index dd813f1784..4ea24ec62e 100644 +index 26ad0e54b2..d7f32ee319 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -11957,6 +11957,8 @@ diff --git a/Patches/LineageOS-18.1/android_packages_apps_Settings/0012-hosts_toggle.patch b/Patches/LineageOS-18.1/android_packages_apps_Settings/0012-hosts_toggle.patch index da263f02..1247258b 100644 --- a/Patches/LineageOS-18.1/android_packages_apps_Settings/0012-hosts_toggle.patch +++ b/Patches/LineageOS-18.1/android_packages_apps_Settings/0012-hosts_toggle.patch @@ -16,7 +16,7 @@ Change-Id: Ic01a142722372d9d57f52947025cd9db23e58ef4 create mode 100644 src/com/android/settings/security/HostsPreferenceController.java diff --git a/res/values/strings.xml b/res/values/strings.xml -index a2c18d6cea..087fd82ef9 100644 +index d723977899..5af3638555 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -11969,6 +11969,9 @@ diff --git a/Patches/LineageOS-18.1/android_packages_apps_Settings/0013-LTE_Only_Mode-1.patch b/Patches/LineageOS-18.1/android_packages_apps_Settings/0013-LTE_Only_Mode-1.patch index 8f863ba5..7d0be244 100644 --- a/Patches/LineageOS-18.1/android_packages_apps_Settings/0013-LTE_Only_Mode-1.patch +++ b/Patches/LineageOS-18.1/android_packages_apps_Settings/0013-LTE_Only_Mode-1.patch @@ -34,7 +34,7 @@ index 79e036a04c..5907f3a52e 100644 TDSCDMA only TDSCDMA/WCDMA diff --git a/res/values/strings.xml b/res/values/strings.xml -index 087fd82ef9..060f94a48f 100644 +index 5af3638555..50803304ac 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -11593,6 +11593,8 @@ diff --git a/Patches/LineageOS-18.1/android_packages_apps_Settings/0014-SUPL_Toggle.patch b/Patches/LineageOS-18.1/android_packages_apps_Settings/0014-SUPL_Toggle.patch index 757a3ff6..b888d4ad 100644 --- a/Patches/LineageOS-18.1/android_packages_apps_Settings/0014-SUPL_Toggle.patch +++ b/Patches/LineageOS-18.1/android_packages_apps_Settings/0014-SUPL_Toggle.patch @@ -11,7 +11,7 @@ Subject: [PATCH] add a toggle for forcibly disabling SUPL create mode 100644 src/com/android/settings/location/ForceDisableSuplPrefController.java diff --git a/res/values/strings.xml b/res/values/strings.xml -index 060f94a48f..2e6e2fc8b2 100644 +index 50803304ac..c597570f35 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -12297,4 +12297,7 @@ diff --git a/Scripts/Common/Fix_CVE_Patchers.sh b/Scripts/Common/Fix_CVE_Patchers.sh index ba8e9adc..2ac6c9b6 100644 --- a/Scripts/Common/Fix_CVE_Patchers.sh +++ b/Scripts/Common/Fix_CVE_Patchers.sh @@ -97,7 +97,7 @@ commentPatches android_kernel_samsung_universal9810.sh "CVE-2020-1749"; commentPatches android_kernel_sony_sdm660.sh "0008-Graphene-Kernel_Hardening-canaries/4.4/0002.patch" "CVE-2019-19319" "CVE-2020-0305" "CVE-2020-8992" "CVE-2020-16166"; commentPatches android_kernel_sony_sdm845.sh "CVE-2019-19319" "CVE-2020-1749" "CVE-2020-8992"; commentPatches android_kernel_xiaomi_msm8937.sh "CVE-2017-13162" "CVE-2019-14070" "CVE-2019-16746" "CVE-2020-0427" "CVE-2020-16166" "CVE-2021-39715/ANY/0001.patch" "CVE-2022-25715"; -commentPatches android_kernel_xiaomi_sdm660.sh "0008-Graphene-Kernel_Hardening-canaries/4.4/0002.patch"; +commentPatches android_kernel_xiaomi_sdm660.sh "0008-Graphene-Kernel_Hardening-canaries/4.4/0002.patch" "CVE-2023-31084/^6.4/0001.patch"; commentPatches android_kernel_xiaomi_sm8150.sh "CVE-2020-24588/4.14/0018.patch"; commentPatches android_kernel_xiaomi_sm8250.sh "CVE-2018-5873" "CVE-2020-1749" "CVE-2021-3444" "CVE-2021-3600" "CVE-2022-22075"; commentPatches android_kernel_yandex_sdm660.sh "CVE-2019-11599" "CVE-2019-14070/ANY/0005.patch" "CVE-2019-19319" "CVE-2020-1749" "CVE-2020-8992" "CVE-2020-16166" "CVE-2023-31084/^6.4/0001.patch"; diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sdm660.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sdm660.sh index f083ec2d..b2d9bd89 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sdm660.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sdm660.sh @@ -172,7 +172,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23559/4.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-26545/4.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-28328/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-30772/4.4/0008.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-31084/^6.4/0001.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-31084/^6.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-32269/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-34256/^6.4/0001.patch editKernelLocalversion "-dos.p175" diff --git a/Scripts/LineageOS-18.1/Functions.sh b/Scripts/LineageOS-18.1/Functions.sh index a8294472..bba7caa5 100644 --- a/Scripts/LineageOS-18.1/Functions.sh +++ b/Scripts/LineageOS-18.1/Functions.sh @@ -114,10 +114,11 @@ patchWorkspaceReal() { verifyAllPlatformTags; gpgVerifyGitHead "$DOS_BUILD_BASE/external/chromium-webview"; - #source build/envsetup.sh; + source build/envsetup.sh; #repopick -it eleven-firewall; #repopick -i 314453; #TaskViewTouchController: Null check current animation on drag #repopick -i 325011; #lineage: Opt-in to shipping full recovery image by default + repopick -it R_asb_2023-06; sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh"; diff --git a/Scripts/LineageOS-18.1/Patch.sh b/Scripts/LineageOS-18.1/Patch.sh index 2f3527e3..52f6bca9 100644 --- a/Scripts/LineageOS-18.1/Patch.sh +++ b/Scripts/LineageOS-18.1/Patch.sh @@ -95,6 +95,7 @@ sed -i '75i$(my_res_package): PRIVATE_AAPT_FLAGS += --auto-add-overlay' core/aap awk -i inplace '!/updatable_apex.mk/' target/product/mainline_system.mk; #Disable APEX sed -i 's/PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION := 23/PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION := 28/' core/version_defaults.mk; #Set the minimum supported target SDK to Pie (GrapheneOS) #sed -i 's/PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := true/PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := false/' core/product_config.mk; #broken by hardenDefconfig +sed -i 's/2023-05-05/2023-06-05/' core/version_defaults.mk; #Bump Security String #R_asb_2023-06 #XXX fi; if enterAndClear "build/soong"; then diff --git a/Scripts/LineageOS-19.1/Functions.sh b/Scripts/LineageOS-19.1/Functions.sh index eeb94c14..36e73140 100644 --- a/Scripts/LineageOS-19.1/Functions.sh +++ b/Scripts/LineageOS-19.1/Functions.sh @@ -88,9 +88,10 @@ patchWorkspaceReal() { verifyAllPlatformTags; gpgVerifyGitHead "$DOS_BUILD_BASE/external/chromium-webview"; - #source build/envsetup.sh; + source build/envsetup.sh; #repopick -ift twelve-bt-sbc-hd-dualchannel; #repopick -it twelve-colors; + repopick -it S_asb_2023-06; sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh"; diff --git a/Scripts/LineageOS-19.1/Patch.sh b/Scripts/LineageOS-19.1/Patch.sh index 9188181a..bd68e082 100644 --- a/Scripts/LineageOS-19.1/Patch.sh +++ b/Scripts/LineageOS-19.1/Patch.sh @@ -97,6 +97,7 @@ sed -i '75i$(my_res_package): PRIVATE_AAPT_FLAGS += --auto-add-overlay' core/aap awk -i inplace '!/updatable_apex.mk/' target/product/generic_system.mk; #Disable APEX sed -i 's/PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION := 23/PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION := 28/' core/version_defaults.mk; #Set the minimum supported target SDK to Pie (GrapheneOS) #sed -i 's/PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := true/PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := false/' core/product_config.mk; #broken by hardenDefconfig +sed -i 's/2023-05-05/2023-06-05/' core/version_defaults.mk; #Bump Security String #S_asb_2023-06 #XXX fi; if enterAndClear "build/soong"; then @@ -314,6 +315,11 @@ if enterAndClear "packages/apps/ThemePicker"; then applyPatch "$DOS_PATCHES/android_packages_apps_ThemePicker/0001-Monet_Toggle.patch"; #Add a UI for enabling Material You (GrapheneOS) fi; +if enterAndClear "packages/apps/Traceur"; then +git fetch https://github.com/LineageOS/android_packages_apps_Traceur refs/changes/65/358265/1 && git cherry-pick FETCH_HEAD; #S_asb_2023-06 +git fetch https://github.com/LineageOS/android_packages_apps_Traceur refs/changes/66/358266/1 && git cherry-pick FETCH_HEAD; +fi; + if enterAndClear "packages/apps/Trebuchet"; then cp $DOS_BUILD_BASE/vendor/divested/overlay/common/packages/apps/Trebuchet/res/xml/default_workspace_*.xml res/xml/; #XXX: Likely no longer needed fi;