From 08a2506fe9ec77b4f9df1461fd965f858cfe65d0 Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Thu, 2 May 2019 14:10:08 -0400
Subject: [PATCH] 14.1: support i9300 and n7100

i9300 has less blobs compared to i9305 due to different modem
---
 Manifests/Manifest_LAOS-14.1.xml              |  6 ++-
 .../CVE_Patchers/android_kernel_samsung_jf.sh | 40 +------------------
 .../android_kernel_samsung_smdk4412.sh        |  2 +-
 Scripts/LineageOS-14.1/Functions.sh           |  2 +
 Scripts/LineageOS-15.1/Functions.sh           |  1 -
 5 files changed, 9 insertions(+), 42 deletions(-)

diff --git a/Manifests/Manifest_LAOS-14.1.xml b/Manifests/Manifest_LAOS-14.1.xml
index 2ebfee13..4d137749 100644
--- a/Manifests/Manifest_LAOS-14.1.xml
+++ b/Manifests/Manifest_LAOS-14.1.xml
@@ -236,6 +236,9 @@
 	<project path="device/samsung/tuna" name="Galaxy-Nexus/android_device_samsung_tuna" remote="github" />
 	<project path="kernel/samsung/tuna" name="Galaxy-Nexus/android_kernel_samsung_tuna" remote="github" />
 
+	<!-- Samsung Galaxy Note 2 (n7100) -->
+	<project path="device/samsung/n7100" name="LineageOS/android_device_samsung_n7100" remote="github" />
+
 	<!-- Samsung Galaxy Note 8.0 Wi-Fi (n5110) -->
 	<project path="device/samsung/kona-common" name="LineageOS/android_device_samsung_kona-common" remote="github" />
 	<project path="device/samsung/n5110" name="LineageOS/android_device_samsung_n5110" remote="github" />
@@ -244,7 +247,8 @@
 	<project path="device/samsung/i9100" name="LineageOS/android_device_samsung_i9100" remote="github" />
 	<project path="device/samsung/galaxys2-common" name="LineageOS/android_device_samsung_galaxys2-common" remote="github" />
 
-	<!-- Samsung Galaxy S III (i9305) -->
+	<!-- Samsung Galaxy S III (i9300) -->
+	<project path="device/samsung/i9300" name="LineageOS/android_device_samsung_i9300" remote="github" />
 	<project path="device/samsung/i9305" name="LineageOS/android_device_samsung_i9305" remote="github" />
 
 	<!-- Samsung Galaxy S4 (jfltexx) -->
diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_jf.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_jf.sh
index f67cfa50..a9733a4c 100644
--- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_jf.sh
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_jf.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 cd "$DOS_BUILD_BASE""kernel/samsung/jf"
-git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0009.patch
 git apply $DOS_PATCHES_LINUX_CVES/0005-Copperhead-Deny_USB/3.4/3.4-Backport.patch
 git apply $DOS_PATCHES_LINUX_CVES/0006-Copperhead-Kernel_Hardening/ANY/0001.patch
@@ -11,64 +10,27 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2185/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2186/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2475/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-3854/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-3857/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-3865/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-3894/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6672/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6791/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-7117/^4.5/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-8402/3.4/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-8404/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0430/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0524/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0573/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0648/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0706/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0710/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0751/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0786/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0791/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-1000111/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-1000380/^4.11/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11015/prima/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11015/prima/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11089/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11090/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11473/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-12153/3.2-^3.16/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13215/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13246/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13292/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13305/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15265/^4.14/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16525/^4.13/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16526/^4.13/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16532/^4.13/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16533/^4.13/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16535/^4.13/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16537/^4.13/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0001.patch
 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-17558/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17806/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7487/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8254/3.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8254/3.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1068/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10880/3.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10882/3.4/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10883/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11832/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9389/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9416/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9439/ANY/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9516/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2001/3.4/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3459/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-8912/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-01/ANY/0008-nfsd-check-for-oversized-NFSv2-v3-arguments.patch
@@ -76,5 +38,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-sy
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-check-in-pm_ops-unregister.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2475/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch
-editKernelLocalversion "-dos.p76"
+editKernelLocalversion "-dos.p38"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_smdk4412.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_smdk4412.sh
index 5e6f06a8..f4ce3ebf 100644
--- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_smdk4412.sh
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_smdk4412.sh
@@ -16,7 +16,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2544/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-3857/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6753/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-7117/^4.5/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-8463/ANY/0001.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-8463/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-9604/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0403/3.0-^3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0404/^3.18/0001.patch
diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh
index dc1406b4..26d58e82 100644
--- a/Scripts/LineageOS-14.1/Functions.sh
+++ b/Scripts/LineageOS-14.1/Functions.sh
@@ -56,11 +56,13 @@ buildAll() {
 	brunch lineage_herolte-user;
 	brunch lineage_himaul-user;
 	brunch lineage_i9100-userdebug;
+	brunch lineage_i9300-userdebug;
 	brunch lineage_i9305-user;
 	brunch lineage_jfltexx-user;
 	brunch lineage_maguro-user;
 	brunch lineage_manta-user;
 	brunch lineage_n5110-user;
+	#brunch lineage_n7100-user; #device/samsung/n7100/selinux/device.te:5:ERROR 'duplicate declaration of type/attribute' at token ';': type hpd_device, dev_type; type mfc_device, dev_type;
 	brunch lineage_osprey-user;
 	#brunch lineage_toro-user;
 	#brunch lineage_toroplus-user;
diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh
index ea467830..db9aad14 100644
--- a/Scripts/LineageOS-15.1/Functions.sh
+++ b/Scripts/LineageOS-15.1/Functions.sh
@@ -86,7 +86,6 @@ patchWorkspace() {
 
 	source build/envsetup.sh;
 	#repopick 219020; #ab-neverallow-user
-	repopick -it O_tzdb2019a;
 
 	source "$DOS_SCRIPTS/Patch.sh";
 	source "$DOS_SCRIPTS/Defaults.sh";