diff --git a/PrebuiltApps b/PrebuiltApps index e5e2efc9..7bc4ee80 160000 --- a/PrebuiltApps +++ b/PrebuiltApps @@ -1 +1 @@ -Subproject commit e5e2efc9c9e30c3d13ceac92b1cec414c78b0a14 +Subproject commit 7bc4ee806a0ab356ddfaeb82cf6210677f1c02ed diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh index dd84a84d..ae166411 100644 --- a/Scripts/LineageOS-14.1/Patch.sh +++ b/Scripts/LineageOS-14.1/Patch.sh @@ -127,7 +127,7 @@ if enter "kernel/wireguard"; then if [ "$DOS_WIREGUARD_INCLUDED" = false ]; then rm Android.mk; fi; #Remove system information from HTTP requests awk -i inplace '!/USER_AGENT=/' fetch.sh; -sed -i '3iUSER_AGENT="WireGuard-AndroidROMBuild/0.2"' fetch.sh; +sed -i '3iUSER_AGENT="WireGuard-AndroidROMBuild/0.23' fetch.sh; fi; enterAndClear "packages/apps/CMParts"; diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh index 001ef95d..3a19ca51 100644 --- a/Scripts/LineageOS-15.1/Patch.sh +++ b/Scripts/LineageOS-15.1/Patch.sh @@ -121,7 +121,7 @@ if enter "kernel/wireguard"; then if [ "$DOS_WIREGUARD_INCLUDED" = false ]; then rm Android.mk; fi; #Remove system information from HTTP requests awk -i inplace '!/USER_AGENT=/' fetch.sh; -sed -i '3iUSER_AGENT="WireGuard-AndroidROMBuild/0.2"' fetch.sh; +sed -i '3iUSER_AGENT="WireGuard-AndroidROMBuild/0.3"' fetch.sh; fi; enterAndClear "lineage-sdk"; diff --git a/Scripts/LineageOS-16.0/Patch.sh b/Scripts/LineageOS-16.0/Patch.sh index 0c0fe201..f83acf87 100644 --- a/Scripts/LineageOS-16.0/Patch.sh +++ b/Scripts/LineageOS-16.0/Patch.sh @@ -116,7 +116,7 @@ if enter "kernel/wireguard"; then if [ "$DOS_WIREGUARD_INCLUDED" = false ]; then rm Android.mk; fi; #Remove system information from HTTP requests awk -i inplace '!/USER_AGENT=/' fetch.sh; -sed -i '3iUSER_AGENT="WireGuard-AndroidROMBuild/0.2"' fetch.sh; +sed -i '3iUSER_AGENT="WireGuard-AndroidROMBuild/0.3"' fetch.sh; fi; enterAndClear "lineage-sdk"; diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_wahoo.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_wahoo.sh index 946971ed..c7603fe1 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_wahoo.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_wahoo.sh @@ -1,6 +1,5 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/google/wahoo" -git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0201-0202.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0006-Copperhead-Kernel_Hardening/ANY/0001.patch 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 @@ -61,19 +60,13 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10622/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10626/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12378/^5.1.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12456/^5.1.5/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12614/^5.1.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14038/ANY/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14047/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16994/^5.0/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19052/^5.3.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19054/^5.3.11/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19066/^5.3.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19073/^5.3.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19074/^5.3.11/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19534/^5.3.11/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19965/^5.4.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/^5.4.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8649/^5.5.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11494/^5.6.2/0001.patch @@ -89,5 +82,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-14875/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10622/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/^5.6.1/0001.patch -editKernelLocalversion "-dos.p89" +editKernelLocalversion "-dos.p82" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/Patch.sh b/Scripts/LineageOS-17.1/Patch.sh index a0d9edb7..300fdf5d 100644 --- a/Scripts/LineageOS-17.1/Patch.sh +++ b/Scripts/LineageOS-17.1/Patch.sh @@ -112,7 +112,7 @@ if enter "kernel/wireguard"; then if [ "$DOS_WIREGUARD_INCLUDED" = false ]; then rm Android.mk; fi; #Remove system information from HTTP requests awk -i inplace '!/USER_AGENT=/' fetch.sh; -sed -i '3iUSER_AGENT="WireGuard-AndroidROMBuild/0.2"' fetch.sh; +sed -i '3iUSER_AGENT="WireGuard-AndroidROMBuild/0.3"' fetch.sh; fi; enterAndClear "libcore"; diff --git a/Scripts/LineageOS-17.1/Rebrand.sh b/Scripts/LineageOS-17.1/Rebrand.sh index 9c27f77c..10b5f765 100644 --- a/Scripts/LineageOS-17.1/Rebrand.sh +++ b/Scripts/LineageOS-17.1/Rebrand.sh @@ -21,6 +21,7 @@ echo "Rebranding..."; enter "bootable/recovery"; +git checkout 53fd25482; #XXX: TEMPORARY! git revert --no-edit 2e0e35734f65035d24014dcce7aceda6e4b1e222 1423e5792837f204e535efd75fd44a2970899a7d 7e46bc14b15fdeabfd16871137f403f89486b83c; sed -i 's/if (lineage_logo_/if (false/' recovery_ui/*ui.cpp; mogrify -format png -fill "#FF5722" -opaque "#167C80" -fuzz 10% res-*/images/*sel.png; #Recolor icons