Git-Mirrors/DivestOS
1
0
Fork 0
mirror of https://github.com/Divested-Mobile/DivestOS-Build.git synced 2024-10-01 01:35:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Churn

Browse Source 
Signed-off-by: Tad <tad@spotco.us>
This commit is contained in:
Tad 2023-02-13 10:19:14 -05:00
parent 29ef757ac6
commit 742a2fb7e2
No known key found for this signature in database
GPG Key ID: B286E9F57A07424B
11 changed files with 18 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Patches/LineageOS-20.0/android_frameworks_base/0007-Always_Restict_Serial.patch
View File

@ -10,10 +10,10 @@ requiring the READ_PHONE_STATE permission.
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index df5113b16f49..eeec22f2ae7f 100644
index 968ff933ed74..fc01e0757d43 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -4816,12 +4816,7 @@ public class ActivityManagerService extends IActivityManager.Stub
@@ -4819,12 +4819,7 @@ public class ActivityManagerService extends IActivityManager.Stub
ProfilerInfo profilerInfo = mAppProfiler.setupProfilerInfoLocked(thread, app, instr);

4
Patches/LineageOS-20.0/android_frameworks_base/0031-appops_reset_fix-1.patch
View File

@ -38,10 +38,10 @@ Such ops are being constructed due to another bug.
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/services/core/java/com/android/server/appop/AppOpsService.java b/services/core/java/com/android/server/appop/AppOpsService.java
index e31c952e10f9..db51cbdb525e 100644
index 20f0c17bb9d9..748ff6bc0d0d 100644
--- a/services/core/java/com/android/server/appop/AppOpsService.java
+++ b/services/core/java/com/android/server/appop/AppOpsService.java
@@ -5197,15 +5197,13 @@ public class AppOpsService extends IAppOpsService.Stub {
@@ -5193,15 +5193,13 @@ public class AppOpsService extends IAppOpsService.Stub {
String lastPkg = null;
for (int i=0; i<allOps.size(); i++) {
AppOpsManager.PackageOps pkg = allOps.get(i);

4
Patches/LineageOS-20.0/android_frameworks_base/0031-appops_reset_fix-2.patch
View File

@ -15,10 +15,10 @@ crashes.
1 file changed, 3 insertions(+)
diff --git a/services/core/java/com/android/server/appop/AppOpsService.java b/services/core/java/com/android/server/appop/AppOpsService.java
index db51cbdb525e..6bf4c3bb7742 100644
index 748ff6bc0d0d..f8feeaad0fa7 100644
--- a/services/core/java/com/android/server/appop/AppOpsService.java
+++ b/services/core/java/com/android/server/appop/AppOpsService.java
@@ -5197,6 +5197,9 @@ public class AppOpsService extends IAppOpsService.Stub {
@@ -5193,6 +5193,9 @@ public class AppOpsService extends IAppOpsService.Stub {
String lastPkg = null;
for (int i=0; i<allOps.size(); i++) {
AppOpsManager.PackageOps pkg = allOps.get(i);

10
Patches/LineageOS-20.0/android_packages_modules_DnsResolver/0001-Hosts_Cache.patch
View File

@ -31,7 +31,7 @@ Change-Id: I5926493864d4b1291ae83f8b601bf5dcc54085cd
create mode 100644 hosts_cache.h
diff --git a/Android.bp b/Android.bp
index 45425aa..e843654 100644
index 45425aa0..e843654c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -164,6 +164,7 @@ cc_library {
@ -43,7 +43,7 @@ index 45425aa..e843654 100644
"res_comp.cpp",
"res_debug.cpp",
diff --git a/getaddrinfo.cpp b/getaddrinfo.cpp
index 6674f23..d854293 100644
index 6674f238..d8542939 100644
--- a/getaddrinfo.cpp
+++ b/getaddrinfo.cpp
@@ -66,6 +66,8 @@
@ -71,7 +71,7 @@ index 6674f23..d854293 100644
cur->ai_next = p;
diff --git a/hosts_cache.cpp b/hosts_cache.cpp
new file mode 100644
index 0000000..a40fb40
index 00000000..a40fb403
--- /dev/null
+++ b/hosts_cache.cpp
@@ -0,0 +1,523 @@
@ -600,7 +600,7 @@ index 0000000..a40fb40
+}
diff --git a/hosts_cache.h b/hosts_cache.h
new file mode 100644
index 0000000..55138dc
index 00000000..55138dcb
--- /dev/null
+++ b/hosts_cache.h
@@ -0,0 +1,28 @@
@ -633,7 +633,7 @@ index 0000000..55138dc
+
+#endif
diff --git a/sethostent.cpp b/sethostent.cpp
index 7f9384c..f1bf657 100644
index 7f9384c0..f1bf6572 100644
--- a/sethostent.cpp
+++ b/sethostent.cpp
@@ -43,6 +43,8 @@

2
Patches/LineageOS-20.0/android_packages_modules_DnsResolver/0001-Hosts_Wildcards.patch
View File

@ -24,7 +24,7 @@ Change-Id: I4b0bb81699151d5b371850daebf785e35ec9b170
1 file changed, 28 insertions(+), 1 deletion(-)
diff --git a/hosts_cache.cpp b/hosts_cache.cpp
index a40fb40..258eac1 100644
index a40fb403..258eac1b 100644
--- a/hosts_cache.cpp
+++ b/hosts_cache.cpp
@@ -126,7 +126,7 @@ static int cmp_hcent_name(const void *a, const void *b)

2
Patches/LineageOS-20.0/android_packages_modules_DnsResolver/0002-hosts_toggle.patch
View File

@ -10,7 +10,7 @@ Change-Id: Iea165003474e1107dc77980985bf9928c369dbb5
1 file changed, 4 insertions(+)
diff --git a/getaddrinfo.cpp b/getaddrinfo.cpp
index d854293..4760f7f 100644
index d8542939..4760f7fd 100644
--- a/getaddrinfo.cpp
+++ b/getaddrinfo.cpp
@@ -57,6 +57,7 @@

21
Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fairphone_sdm632.sh
View File

@ -1,8 +1,5 @@
#!/bin/bash
cd "$DOS_BUILD_BASE""kernel/fairphone/sdm632"
git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0332-0333.patch --exclude=Makefile
git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0333-0334.patch --exclude=Makefile
git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0334-0335.patch --exclude=Makefile
git apply $DOS_PATCHES_LINUX_CVES/0005-Graphene-Deny_USB/4.9/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-allocsize/4.9/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-allocsize/4.9/0015.patch
@ -72,35 +69,19 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0012.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1679/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2153/^5.17/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2153/^5.17/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2978/4.9/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3061/^5.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3424/4.9/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3542/3.8-^6.0/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3565/4.9/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3594/4.9/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3621/4.9/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3643/4.9/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3646/4.9/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3649/4.9/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-4382/^6.2/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20148/^5.15/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20369/4.14/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20371/ANY/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28388/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36280/4.9/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-40768/4.9/0007.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-41849/4.9/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-41850/4.9/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/4.9/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-45934/4.9/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-0045/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-0394/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-0615/4.9/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23559/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-fortify/4.9/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-ro/4.9/0016.patch
git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-ro/4.9/0029.patch
git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-slab/4.9/0005.patch
editKernelLocalversion "-dos.p102"
editKernelLocalversion "-dos.p83"
cd "$DOS_BUILD_BASE"

3
Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_gs101_private_gs-google.sh
View File

@ -160,7 +160,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36879/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36946/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39188/5.10/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39188/5.10/0007.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39842/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-40307/5.10/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-40768/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-41218/5.10/0004.patch
@ -190,5 +189,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-0615/5.10/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23454/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23455/5.10/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23559/5.10/0004.patch
editKernelLocalversion "-dos.p190"
editKernelLocalversion "-dos.p189"
cd "$DOS_BUILD_BASE"

3
Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_gs201_private_gs-google.sh
View File

@ -160,7 +160,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36879/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36946/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39188/5.10/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39188/5.10/0007.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39842/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-40307/5.10/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-40768/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-41218/5.10/0004.patch
@ -190,5 +189,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-0615/5.10/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23454/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23455/5.10/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23559/5.10/0004.patch
editKernelLocalversion "-dos.p190"
editKernelLocalversion "-dos.p189"
cd "$DOS_BUILD_BASE"

4
Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_msm-4.14.sh
View File

@ -101,12 +101,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-4662/4.14/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20369/4.14/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20382/ANY/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25677/ANY/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25712/ANY/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36280/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36946/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39188/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39842/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-40307/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-40768/4.14/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-41218/4.14/0002.patch
@ -124,5 +122,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-0394/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-0615/4.14/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23455/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23559/4.14/0002.patch
editKernelLocalversion "-dos.p124"
editKernelLocalversion "-dos.p122"
cd "$DOS_BUILD_BASE"

3
Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_redbull.sh
View File

@ -114,7 +114,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36280/4.19/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36946/4.19/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39188/4.19/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39188/4.19/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39842/4.19/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-40307/4.19/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-40768/4.19/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-41218/4.19/0003.patch
@ -134,5 +133,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-0394/4.19/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-0615/4.19/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23455/4.19/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23559/4.19/0003.patch
editKernelLocalversion "-dos.p134"
editKernelLocalversion "-dos.p133"
cd "$DOS_BUILD_BASE"