AtaraxiaDev/divestos-build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Tweak

Browse Source 
Signed-off-by: Tad <tad@spotco.us>
This commit is contained in:
Tad 2022-03-14 11:57:34 -04:00
parent f65c7a4ccd
commit 9ba3a061c6
9 changed files with 21 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Patches/LineageOS-18.1/android_frameworks_base/0009-SystemUI_No_Permission_Review.patch
View File

@ -8,7 +8,7 @@ Subject: [PATCH] allow SystemUI to directly manage Bluetooth/WiFi
1 file changed, 3 insertions(+) 1 file changed, 3 insertions(+)
diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml
index 6bee19745c87..ac231c5fafbe 100644 index c536b6cb94df..cf0607449054 100644
--- a/packages/SystemUI/AndroidManifest.xml --- a/packages/SystemUI/AndroidManifest.xml
+++ b/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml
@@ -78,6 +78,9 @@ @@ -78,6 +78,9 @@

2
Patches/LineageOS-18.1/android_frameworks_base/0013-Network_Permission-2.patch
View File

@ -10,7 +10,7 @@ Ported from 10: 5e2898e9d21dd6802bb0b0139e7e496c41e1cd80
2 files changed, 2 insertions(+), 2 deletions(-) 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index ee428371a016..0eff7ae9a0cd 100644 index 26fd27b7b5ff..2a79c6019fc1 100644
--- a/core/res/AndroidManifest.xml --- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml
@@ -1607,7 +1607,7 @@ @@ -1607,7 +1607,7 @@

2
Patches/LineageOS-18.1/android_frameworks_base/0013-Network_Permission-3.patch
View File

@ -29,7 +29,7 @@ index 952ccdad992c..728c0e95ca6d 100644
field public static final String SENSORS = "android.permission-group.SENSORS"; field public static final String SENSORS = "android.permission-group.SENSORS";
field public static final String SMS = "android.permission-group.SMS"; field public static final String SMS = "android.permission-group.SMS";
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 0eff7ae9a0cd..00351c340a1a 100644 index 2a79c6019fc1..e70e54b62f61 100644
--- a/core/res/AndroidManifest.xml --- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml
@@ -1601,10 +1601,18 @@ @@ -1601,10 +1601,18 @@

53
Patches/LineageOS-18.1/android_kernel_oneplus_sdm845/4.9.282-qc.patch
View File

@ -1,6 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us> From: Tad <tad@spotco.us>
Date: Wed, 29 Dec 2021 11:25:29 -0500 Date: Sat, 12 Mar 2022 12:28:36 -0500
Subject: [PATCH] Merge remote-tracking branch 'qc/msm-4.9' into HEAD Subject: [PATCH] Merge remote-tracking branch 'qc/msm-4.9' into HEAD
Signed-off-by: Tad <tad@spotco.us> Signed-off-by: Tad <tad@spotco.us>
@ -34,7 +34,7 @@ Change-Id: Ie4ee3fa1a2c9d22acdcb19f4d07e068ef4388513
.../trace-pagealloc-postprocess.pl | 2 +- .../trace-pagealloc-postprocess.pl | 2 +-
.../postprocess/trace-vmscan-postprocess.pl | 2 +- .../postprocess/trace-vmscan-postprocess.pl | 2 +-
Documentation/virtual/kvm/api.txt | 2 + Documentation/virtual/kvm/api.txt | 2 +
Makefile | 52 +- Makefile | 50 +-
arch/alpha/include/asm/io.h | 8 +- arch/alpha/include/asm/io.h | 8 +-
arch/alpha/include/asm/uaccess.h | 67 +- arch/alpha/include/asm/uaccess.h | 67 +-
arch/alpha/kernel/smp.c | 2 +- arch/alpha/kernel/smp.c | 2 +-
@ -2558,7 +2558,7 @@ Change-Id: Ie4ee3fa1a2c9d22acdcb19f4d07e068ef4388513
lib/random32.c | 462 ++- lib/random32.c | 462 ++-
lib/seq_buf.c | 8 +- lib/seq_buf.c | 8 +-
lib/stackdepot.c | 6 +- lib/stackdepot.c | 6 +-
lib/string.c | 137 +- lib/string.c | 113 +-
lib/swiotlb.c | 6 +- lib/swiotlb.c | 6 +-
lib/zlib_inflate/inffast.c | 91 +- lib/zlib_inflate/inffast.c | 91 +-
mm/backing-dev.c | 1 + mm/backing-dev.c | 1 +
@ -3084,7 +3084,7 @@ Change-Id: Ie4ee3fa1a2c9d22acdcb19f4d07e068ef4388513
tools/testing/selftests/x86/syscall_nt.c | 1 + tools/testing/selftests/x86/syscall_nt.c | 1 +
tools/usb/usbip/libsrc/usbip_host_common.c | 2 +- tools/usb/usbip/libsrc/usbip_host_common.c | 2 +-
virt/kvm/kvm_main.c | 25 +- virt/kvm/kvm_main.c | 25 +-
3078 files changed, 41962 insertions(+), 15294 deletions(-) 3078 files changed, 41937 insertions(+), 15293 deletions(-)
create mode 100644 Documentation/devicetree/bindings/input/hall_sensor.txt create mode 100644 Documentation/devicetree/bindings/input/hall_sensor.txt
create mode 100644 Documentation/devicetree/bindings/input/misc/bma2x2.txt create mode 100644 Documentation/devicetree/bindings/input/misc/bma2x2.txt
create mode 100644 Documentation/devicetree/bindings/input/misc/ltr553.txt create mode 100644 Documentation/devicetree/bindings/input/misc/ltr553.txt
@ -3837,7 +3837,7 @@ index d1908e50b506..b8f5bf2a890a 100644
__u64 evt_page; __u64 evt_page;
__u64 msg_page; __u64 msg_page;
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index 63c7cdc23d65..e61a3796a5ed 100644 index 73dd2ebec1f0..e61a3796a5ed 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
@ -3871,15 +3871,6 @@ index 63c7cdc23d65..e61a3796a5ed 100644
PERL = perl PERL = perl
PYTHON = python PYTHON = python
CHECK = sparse CHECK = sparse
@@ -519,7 +515,7 @@ ifeq ($(shell $(srctree)/scripts/clang-android.sh $(CC) $(CLANG_FLAGS)), y)
$(error "Clang with Android --target detected. Did you specify CLANG_TRIPLE?")
endif
GCC_TOOLCHAIN_DIR := $(dir $(shell which $(CROSS_COMPILE)elfedit))
-CLANG_FLAGS += --prefix=$(GCC_TOOLCHAIN_DIR)
+CLANG_FLAGS += --prefix=$(GCC_TOOLCHAIN_DIR)$(notdir $(CROSS_COMPILE))
GCC_TOOLCHAIN := $(realpath $(GCC_TOOLCHAIN_DIR)/..)
endif
ifneq ($(GCC_TOOLCHAIN),)
@@ -797,12 +793,11 @@ KBUILD_CFLAGS += $(call cc-disable-warning, tautological-compare) @@ -797,12 +793,11 @@ KBUILD_CFLAGS += $(call cc-disable-warning, tautological-compare)
# See modpost pattern 2 # See modpost pattern 2
KBUILD_CFLAGS += $(call cc-option, -mno-global-merge,) KBUILD_CFLAGS += $(call cc-option, -mno-global-merge,)
@ -113748,7 +113739,7 @@ index 759ff419fe61..c519aa07d2e9 100644
if (prealloc) { if (prealloc) {
/* Nobody used this memory, ok to free it. */ /* Nobody used this memory, ok to free it. */
diff --git a/lib/string.c b/lib/string.c diff --git a/lib/string.c b/lib/string.c
index fbaca936f69c..9f4a98cd47e1 100644 index 9b2df9077a92..9f4a98cd47e1 100644
--- a/lib/string.c --- a/lib/string.c
+++ b/lib/string.c +++ b/lib/string.c
@@ -157,11 +157,9 @@ EXPORT_SYMBOL(strlcpy); @@ -157,11 +157,9 @@ EXPORT_SYMBOL(strlcpy);
@ -113779,34 +113770,10 @@ index fbaca936f69c..9f4a98cd47e1 100644
*/ */
ssize_t strscpy(char *dest, const char *src, size_t count) ssize_t strscpy(char *dest, const char *src, size_t count)
{ {
@@ -235,6 +235,63 @@ ssize_t strscpy(char *dest, const char *src, size_t count) @@ -259,6 +259,39 @@ char *stpcpy(char *__restrict__ dest, const char *__restrict__ src)
EXPORT_SYMBOL(strscpy); }
#endif EXPORT_SYMBOL(stpcpy);
+/**
+ * stpcpy - copy a string from src to dest returning a pointer to the new end
+ * of dest, including src's %NUL-terminator. May overrun dest.
+ * @dest: pointer to end of string being copied into. Must be large enough
+ * to receive copy.
+ * @src: pointer to the beginning of string being copied from. Must not overlap
+ * dest.
+ *
+ * stpcpy differs from strcpy in a key way: the return value is a pointer
+ * to the new %NUL-terminating character in @dest. (For strcpy, the return
+ * value is a pointer to the start of @dest). This interface is considered
+ * unsafe as it doesn't perform bounds checking of the inputs. As such it's
+ * not recommended for usage. Instead, its definition is provided in case
+ * the compiler lowers other libcalls to stpcpy.
+ */
+char *stpcpy(char *__restrict__ dest, const char *__restrict__ src);
+char *stpcpy(char *__restrict__ dest, const char *__restrict__ src)
+{
+ while ((*dest++ = *src++) != '\0')
+ /* nothing */;
+ return --dest;
+}
+EXPORT_SYMBOL(stpcpy);
+
+/** +/**
+ * strscpy_pad() - Copy a C-string into a sized buffer + * strscpy_pad() - Copy a C-string into a sized buffer
+ * @dest: Where to copy the string to + * @dest: Where to copy the string to
@ -113843,7 +113810,7 @@ index fbaca936f69c..9f4a98cd47e1 100644
#ifndef __HAVE_ARCH_STRCAT #ifndef __HAVE_ARCH_STRCAT
/** /**
* strcat - Append one %NUL-terminated string to another * strcat - Append one %NUL-terminated string to another
@@ -697,6 +754,72 @@ void memzero_explicit(void *s, size_t count) @@ -721,6 +754,72 @@ void memzero_explicit(void *s, size_t count)
} }
EXPORT_SYMBOL(memzero_explicit); EXPORT_SYMBOL(memzero_explicit);

2
Scripts/Common/Fix_CVE_Patchers.sh
View File

@ -50,7 +50,7 @@ commentPatches android_kernel_google_bonito.sh "CVE-2020-0067";
commentPatches android_kernel_google_coral.sh "CVE-2019-19319" "CVE-2020-1749" "CVE-2020-8992" "CVE-2021-30324"; commentPatches android_kernel_google_coral.sh "CVE-2019-19319" "CVE-2020-1749" "CVE-2020-8992" "CVE-2021-30324";
commentPatches android_kernel_google_dragon.sh "0006-AndroidHardening-Kernel_Hardening/3.18/0026.patch" "0008-Graphene-Kernel_Hardening/4.9/0053.patch" "0008-Graphene-Kernel_Hardening/4.9/0055.patch" "CVE-2015-4167" "CVE-2017-15951" "CVE-2016-1237" "CVE-2016-6198" "CVE-2017-7374" "CVE-2018-17972" "CVE-2019-2214" "CVE-2021-39715/ANY/0001.patch"; commentPatches android_kernel_google_dragon.sh "0006-AndroidHardening-Kernel_Hardening/3.18/0026.patch" "0008-Graphene-Kernel_Hardening/4.9/0053.patch" "0008-Graphene-Kernel_Hardening/4.9/0055.patch" "CVE-2015-4167" "CVE-2017-15951" "CVE-2016-1237" "CVE-2016-6198" "CVE-2017-7374" "CVE-2018-17972" "CVE-2019-2214" "CVE-2021-39715/ANY/0001.patch";
commentPatches android_kernel_google_crosshatch.sh "CVE-2020-0067"; commentPatches android_kernel_google_crosshatch.sh "CVE-2020-0067";
commentPatches android_kernel_google_marlin.sh "0001-LinuxIncrementals/3.18/3.18.0098-0099.patch" "0006-AndroidHardening-Kernel_Hardening/3.18/0048.patch" "0006-AndroidHardening-Kernel_Hardening/3.18/0049.patch" "CVE-2017-13162/3.18/0001.patch" "CVE-2017-14883" "CVE-2017-15951" "CVE-2018-17972" "CVE-2019-16746" "CVE-2020-0427" "CVE-2020-14381" "CVE-2020-16166"; commentPatches android_kernel_google_marlin.sh "0001-LinuxIncrementals/3.18/3.18.0098-0099.patch" "0006-AndroidHardening-Kernel_Hardening/3.18/0048.patch" "0006-AndroidHardening-Kernel_Hardening/3.18/0049.patch" "CVE-2017-13162/3.18/0001.patch" "CVE-2017-14883" "CVE-2017-15951" "CVE-2018-17972" "CVE-2019-16746" "CVE-2020-0427" "CVE-2020-14381" "CVE-2020-16166" "CVE-2021-39715/ANY/0001.patch";
commentPatches android_kernel_google_msm.sh "CVE-2017-11015/prima" "CVE-2021-Misc2/ANY/0031.patch"; commentPatches android_kernel_google_msm.sh "CVE-2017-11015/prima" "CVE-2021-Misc2/ANY/0031.patch";
commentPatches android_kernel_google_msm-4.9.sh "CVE-2019-19319" "CVE-2020-0067" "CVE-2020-1749" "CVE-2020-8992" "CVE-2021-30324" "CVE-2021-45469"; commentPatches android_kernel_google_msm-4.9.sh "CVE-2019-19319" "CVE-2020-0067" "CVE-2020-1749" "CVE-2020-8992" "CVE-2021-30324" "CVE-2021-45469";
commentPatches android_kernel_google_redbull.sh "CVE-2018-5873" "CVE-2021-3444" "CVE-2021-3600"; commentPatches android_kernel_google_redbull.sh "CVE-2018-5873" "CVE-2021-3444" "CVE-2021-3600";

2
Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_marlin.sh
View File

@ -434,7 +434,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38204/4.4/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.4/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39634/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39634/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39714/4.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39714/4.4/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39715/ANY/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39715/ANY/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-42008/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-42008/4.4/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-42739/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-42739/4.9/0004.patch

3
Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_msm8998.sh
View File

@ -40,7 +40,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16994/4.9/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/4.4/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/4.4/0012.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19068/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19068/4.4/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3625/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3625/ANY/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11160/4.4/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14386/3.10-^4.4/0002.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-2020-16119/^5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0935/4.9/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0935/4.9/0006.patch
@ -55,5 +54,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.9/0007.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.9/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.9/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/4.9/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25375/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25375/4.9/0004.patch
editKernelLocalversion "-dos.p55" editKernelLocalversion "-dos.p54"
cd "$DOS_BUILD_BASE" cd "$DOS_BUILD_BASE"

3
Scripts/LineageOS-18.1/Functions.sh
View File

@ -142,13 +142,12 @@ patchWorkspace() {
touch DOS_PATCHED_FLAG; touch DOS_PATCHED_FLAG;
if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/lineage"; fi; if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/lineage"; fi;
source build/envsetup.sh; #source build/envsetup.sh;
#repopick -it eleven-firewall; #repopick -it eleven-firewall;
#repopick -i 314130; #adbconnection: don't spin if adbd isn't running #repopick -i 314130; #adbconnection: don't spin if adbd isn't running
#repopick -i 314453; #TaskViewTouchController: Null check current animation on drag #repopick -i 314453; #TaskViewTouchController: Null check current animation on drag
#repopick -i 320663; #Trebuchet: Don't hide home screen rotation setting #repopick -i 320663; #Trebuchet: Don't hide home screen rotation setting
#repopick -i 321297; #fs_mgr: Don't enable clean_scratch_files on non-dynamic devices #repopick -i 321297; #fs_mgr: Don't enable clean_scratch_files on non-dynamic devices
repopick -it R_asb_2022-03;
sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS/Patch.sh";
sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";

6
Scripts/LineageOS-18.1/Patch.sh
View File

@ -338,7 +338,8 @@ echo "allow cameraserver sysfs_soc:file r_file_perms;" >> sepolicy/vendor/camera
fi; fi;
if enterAndClear "device/essential/mata"; then if enterAndClear "device/essential/mata"; then
git revert --no-edit 1f1d061c4d7ddedcac503608e8fa333aff30a693 3928b30a97fe7f6b6020bbd9d83a56a32de4ba16 e91f0fece65d32ca407be532e2c4456056b1a968; #Unbreak the earpiece speaker, breaking the loud speaker volume control on calls #git revert --no-edit 1f1d061c4d7ddedcac503608e8fa333aff30a693 3928b30a97fe7f6b6020bbd9d83a56a32de4ba16 e91f0fece65d32ca407be532e2c4456056b1a968; #Unbreak the earpiece speaker, breaking the loud speaker volume control on calls
echo "allow permissioncontroller_app tethering_service:service_manager find;" > sepolicy/private/permissioncontroller_app.te;
fi; fi;
if enterAndClear "device/google/bonito"; then if enterAndClear "device/google/bonito"; then
@ -378,7 +379,8 @@ sed -i '1itypeattribute wcnss_service misc_block_device_exception;' sepolicy/wcn
fi; fi;
if enterAndClear "device/lge/mako"; then if enterAndClear "device/lge/mako"; then
applyPatch "$DOS_PATCHES/android_device_lge_mako/0001-LTE.patch"; #Enable LTE support git revert --no-edit 4d779eb8e653640f192878f3f666cb54ea65bf47;
applyPatch "$DOS_PATCHES/android_device_lge_mako/0001-LTE.patch"; #Enable LTE support #TODO: rebase
rm overlay/packages/apps/CarrierConfig/res/xml/vendor.xml; rm overlay/packages/apps/CarrierConfig/res/xml/vendor.xml;
echo "pmf=0" >> wifi/wpa_supplicant_overlay.conf; #Wi-Fi chipset doesn't support PMF echo "pmf=0" >> wifi/wpa_supplicant_overlay.conf; #Wi-Fi chipset doesn't support PMF
awk -i inplace '!/TARGET_RELEASETOOLS_EXTENSIONS/' BoardConfig.mk; #broken releasetools awk -i inplace '!/TARGET_RELEASETOOLS_EXTENSIONS/' BoardConfig.mk; #broken releasetools