From 6b94c8cdcb1a985f51ec7f692769a5cdb41af907 Mon Sep 17 00:00:00 2001 From: Tad Date: Tue, 20 Jun 2023 23:14:26 -0400 Subject: [PATCH] Fixup Signed-off-by: Tad --- Scripts/Common/Fix_CVE_Patchers.sh | 2 +- .../CVE_Patchers/android_kernel_fairphone_sdm632.sh | 2 +- .../CVE_Patchers/android_kernel_google_msm-4.9.sh | 2 +- .../CVE_Patchers/android_kernel_oneplus_sdm845.sh | 2 +- .../CVE_Patchers/android_kernel_razer_sdm845.sh | 2 +- .../CVE_Patchers/android_kernel_samsung_exynos9810.sh | 2 +- .../LineageOS-20.0/CVE_Patchers/android_kernel_sony_sdm845.sh | 2 +- .../CVE_Patchers/android_kernel_xiaomi_msm8937.sh | 2 +- .../CVE_Patchers/android_kernel_xiaomi_sdm845.sh | 2 +- Scripts/init.sh | 4 ++-- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Scripts/Common/Fix_CVE_Patchers.sh b/Scripts/Common/Fix_CVE_Patchers.sh index b6eb7146..608ea2c2 100644 --- a/Scripts/Common/Fix_CVE_Patchers.sh +++ b/Scripts/Common/Fix_CVE_Patchers.sh @@ -140,7 +140,7 @@ done declare -a fourDotNine=("${fourDotFour[@]}" "android_kernel_fairphone_sdm632.sh" "android_kernel_google_msm-4.9.sh" "android_kernel_oneplus_sdm845.sh" "android_kernel_razer_sdm845.sh" "android_kernel_samsung_exynos9810.sh" "android_kernel_samsung_universal9810.sh" "android_kernel_sony_sdm845.sh" "android_kernel_xiaomi_msm8937.sh" "android_kernel_xiaomi_sdm845.sh"); for script in "${fourDotNine[@]}" do - commentPatches $script "CVE-2018-11412/4.14" "CVE-2020-0067/4.14" "CVE-2022-1204/4.14" "CVE-2023-0461/4.14" "CVE-2023-31084/^6.4/0001.patch"; #handle 4.14 + commentPatches $script "CVE-2018-11412/4.14" "CVE-2020-0067/4.14" "CVE-2022-1204/4.14" "CVE-2023-0461/4.14" "CVE-2023-31084"; #handle 4.14 done echo -e "\e[0;32m[SCRIPT COMPLETE] Fixed CVE patchers\e[0m"; diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fairphone_sdm632.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fairphone_sdm632.sh index 76049282..905a6a11 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fairphone_sdm632.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fairphone_sdm632.sh @@ -97,7 +97,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-2985/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-3141/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23559/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-30772/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-31084/4.14/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-31084/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-32269/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-34256/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-fortify/4.9/0003.patch diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_msm-4.9.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_msm-4.9.sh index b37ce1ba..e83f9ab2 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_msm-4.9.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_msm-4.9.sh @@ -103,7 +103,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-2985/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-3141/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23559/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-30772/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-31084/4.14/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-31084/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-32269/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-34256/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-fortify/4.9/0003.patch diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sdm845.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sdm845.sh index 77326c14..c69ebc13 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sdm845.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sdm845.sh @@ -97,7 +97,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-2985/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-3141/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23559/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-30772/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-31084/4.14/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-31084/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-32269/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-34256/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-fortify/4.9/0003.patch diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_razer_sdm845.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_razer_sdm845.sh index 451b9815..7aa99bca 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_razer_sdm845.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_razer_sdm845.sh @@ -97,7 +97,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-2985/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-3141/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23559/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-30772/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-31084/4.14/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-31084/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-32269/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-34256/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-fortify/4.9/0003.patch diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_samsung_exynos9810.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_samsung_exynos9810.sh index 6f5f811d..5bee9964 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_samsung_exynos9810.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_samsung_exynos9810.sh @@ -580,7 +580,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23559/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-28328/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-28772/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-30772/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-31084/4.14/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-31084/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-32269/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-34256/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-ro/4.9/0016.patch diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_sony_sdm845.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_sony_sdm845.sh index 011282e4..c16d0f31 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_sony_sdm845.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_sony_sdm845.sh @@ -415,7 +415,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23559/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-28328/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-28772/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-30772/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-31084/4.14/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-31084/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-32269/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-34256/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-fortify/4.9/0003.patch diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_msm8937.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_msm8937.sh index b3f19b80..7ebe20d4 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_msm8937.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_msm8937.sh @@ -95,7 +95,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-2985/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-3141/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23559/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-30772/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-31084/4.14/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-31084/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-32269/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-34256/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-fortify/4.9/0003.patch diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_sdm845.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_sdm845.sh index ec2cbc07..59a7e79c 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_sdm845.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_sdm845.sh @@ -99,7 +99,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-2985/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-3141/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23559/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-30772/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-31084/4.14/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-31084/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-32269/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-34256/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-fortify/4.9/0003.patch diff --git a/Scripts/init.sh b/Scripts/init.sh index a0c48984..b9b2c0ee 100644 --- a/Scripts/init.sh +++ b/Scripts/init.sh @@ -91,8 +91,8 @@ export DOS_BRANDING_BOOTANIMATION_FONT="Fira-Sans-Heavy"; #Options: $ convert -l export DOS_BRANDING_BOOTANIMATION_STYLE="plasma"; #Options: gradient, plasma #export DOS_BRANDING_BOOTANIMATION_COLOR="#FF5722-#FF8A65"; #gradient export DOS_BRANDING_BOOTANIMATION_COLOR="#FF5722-#03A9F4"; #plasma -export DOS_BRANDING_LINK_ABOUT="https://divestos.org/index.php?page=about"; -export DOS_BRANDING_LINK_PRIVACY="https://divestos.org/index.php?page=privacy_policy"; +export DOS_BRANDING_LINK_ABOUT="https://divestos.org/pages/about"; +export DOS_BRANDING_LINK_PRIVACY="https://divestos.org/pages/privacy_policy"; export DOS_BRANDING_SERVER_OTA="https://divestos.org/updater.php"; export DOS_BRANDING_SERVER_OTA_ONION="$DOS_BRANDING_SERVER_OTA"; #TODO: need to handle allow cleartext