From 6ea39e0a0fb21b5326c213258db6a7b9796b3fa7 Mon Sep 17 00:00:00 2001 From: Tad Date: Tue, 13 Nov 2018 17:33:49 -0500 Subject: [PATCH] Updates --- Patches/Common/android_vendor_divested/packages.mk | 3 ++- Patches/Linux | 2 +- PrebuiltApps | 2 +- .../CVE_Patchers/android_kernel_motorola_msm8916.sh | 2 +- .../CVE_Patchers/android_kernel_motorola_msm8974.sh | 2 +- Scripts/LineageOS-14.1/Functions.sh | 1 - .../CVE_Patchers/android_kernel_motorola_msm8974.sh | 5 ++--- .../CVE_Patchers/android_kernel_samsung_universal9810.sh | 8 ++------ Scripts/LineageOS-15.1/Functions.sh | 8 +++++--- 9 files changed, 15 insertions(+), 18 deletions(-) diff --git a/Patches/Common/android_vendor_divested/packages.mk b/Patches/Common/android_vendor_divested/packages.mk index fdb55831..00615ffd 100644 --- a/Patches/Common/android_vendor_divested/packages.mk +++ b/Patches/Common/android_vendor_divested/packages.mk @@ -15,7 +15,7 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ FennecDOS \ Silence \ - SimpleGallery \ + CameraRoll \ VanillaMusic # Others @@ -24,6 +24,7 @@ PRODUCT_PACKAGES += \ # Notes # - Available (via PrebuiltApps submodule): K9Mail, NetMonitor, OpenKeychain, Orbot, Shelter, TalkBack, TorBrowser +# - Gallery Choices: None (AOSP/Lineage), CameraRoll, SimpleGallery # - K-9 Mail Will be included after 5.5xx release # - Net Monitor will be included after #58 is merged # - OpenKeychain inclusion is undecided yet diff --git a/Patches/Linux b/Patches/Linux index 7140c1f2..e8162deb 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit 7140c1f2414732ddc91e9dfda6ec022b93960a91 +Subproject commit e8162debfa37e59a1a654f5c7aa8635fde9ee77f diff --git a/PrebuiltApps b/PrebuiltApps index 9ef28e4c..488948e2 160000 --- a/PrebuiltApps +++ b/PrebuiltApps @@ -1 +1 @@ -Subproject commit 9ef28e4cc340fde150e751b078424eb6090205bd +Subproject commit 488948e2e1a79b8701da7aa639bc69dda3d8ddc7 diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8916.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8916.sh index c924db0f..05bc211d 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8916.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8916.sh @@ -82,7 +82,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3563/3.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5390/3.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5390/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5904/3.10/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9514/ANY/0001.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9514/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9515/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9516/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9518/ANY/0001.patch diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8974.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8974.sh index 2cbfbfe1..bfad3971 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8974.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8974.sh @@ -41,7 +41,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17806/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-6348/^4.9/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7373/3.4/0001.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7373/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7487/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7533/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8246/3.4/0002.patch diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh index 70ee6392..047b1b71 100644 --- a/Scripts/LineageOS-14.1/Functions.sh +++ b/Scripts/LineageOS-14.1/Functions.sh @@ -98,7 +98,6 @@ patchWorkspace() { if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/cm"; fi; source build/envsetup.sh; repopick -t n_asb_09-2018-qcom; - repopick -it n_asb_11-2018; source "$DOS_SCRIPTS/Patch.sh"; source "$DOS_SCRIPTS/Defaults.sh"; diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_motorola_msm8974.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_motorola_msm8974.sh index 2cbfbfe1..ccf02a49 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_motorola_msm8974.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_motorola_msm8974.sh @@ -41,9 +41,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17806/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-6348/^4.9/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7373/3.4/0001.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7373/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7487/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7533/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8246/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8247/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8254/3.4/0001.patch @@ -66,5 +65,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/772877_0001-usb-core-Fix-use- git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-9f34c6ebc016cd061ae5ec901221d15fa3d67e49.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch -editKernelLocalversion "-dos.p67" +editKernelLocalversion "-dos.p65" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_samsung_universal9810.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_samsung_universal9810.sh index 3319bb32..1a9f4ff3 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_samsung_universal9810.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_samsung_universal9810.sh @@ -1,6 +1,5 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/samsung/universal9810" -git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0107-0108.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 git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9900/ANY/0001.patch @@ -8,16 +7,13 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-1583/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0627/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11036/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13245/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0009.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10883/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3575/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5848/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9363/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9415/ANY/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9516/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9416/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch -editKernelLocalversion "-dos.p20" +editKernelLocalversion "-dos.p15" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh index 8d58e9f0..e0f4e16b 100644 --- a/Scripts/LineageOS-15.1/Functions.sh +++ b/Scripts/LineageOS-15.1/Functions.sh @@ -50,7 +50,7 @@ buildAll() { if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanWorkspaceForMalware; fi; #TODO: hiae brunch lineage_mako-user; - brunch lineage_d852-user; + #brunch lineage_d852-user; brunch lineage_bacon-user; brunch lineage_angler-user; brunch lineage_bullhead-user; @@ -86,8 +86,10 @@ patchWorkspace() { source build/envsetup.sh; #repopick 219020 219022; #ab-neverallow-user - repopick -f 214824 209584 209585 215010 214300; #g3-common - repopick -f 211404 211405 211406 211407 211408 211409; #d852 + + #broken by g3-oreo, pending merge + #repopick -f 214824 209584 209585 215010 214300; #g3-common + #repopick -f 211404 211405 211406 211407 211408 211409; #d852 source "$DOS_SCRIPTS/Patch.sh"; source "$DOS_SCRIPTS/Defaults.sh";