From 2711871d508c03fe7bf8a1891405eab27537e2d1 Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Thu, 9 Nov 2017 20:56:11 -0500
Subject: [PATCH] PAPP: Add more apps

---
 Patches/LineageOS-14.1/android_vendor_cm/config.xml | 8 ++++++++
 Scripts/LineageOS-14.1/Patch.sh                     | 9 ++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/Patches/LineageOS-14.1/android_vendor_cm/config.xml b/Patches/LineageOS-14.1/android_vendor_cm/config.xml
index dc917fef..24567e37 100644
--- a/Patches/LineageOS-14.1/android_vendor_cm/config.xml
+++ b/Patches/LineageOS-14.1/android_vendor_cm/config.xml
@@ -41,10 +41,13 @@
         <item>com.android.settings.*,3</item>
         <item>com.catchingnow.tinyclipboardmanager.*,0</item>
         <item>com.commit451.gitlab.*,1</item>
+        <item>com.cuberite.android.*,4</item>
         <item>com.cyanogenmod.eleven.*,3</item>
         <item>com.darshancomputing.BatteryIndicatorPro.*,3</item>
         <item>com.dosse.chromiumautoupdater.*,4</item>
         <item>com.dozingcatsoftware.bouncy.*,3</item>
+        <item>com.forrestguice.sumtimeswidget.*,0</item>
+        <item>com.fr3ts0n.ecu.gui.androbd.*,3</item>
         <item>com.fsck.k9.*,1</item>
         <item>com.github.pires.obd.reader.*,3</item>
         <item>com.github.yeriomin.yalpstore.*,1</item>
@@ -79,6 +82,7 @@
         <item>de.blinkt.openvpn.*,3</item>
         <item>de.schildbach.wallet.*,1</item>
         <item>de.srlabs.snoopsnitch.*,3</item>
+        <item>de.tap.easy_xkcd.*,0</item>
         <item>de.tobiasbielefeld.solitaire.*,0</item>
         <item>de.westnordost.streetcomplete.*,1</item>
         <item>dev.ukanth.ufirewall.*,3</item>
@@ -150,6 +154,7 @@
         <item>org.sufficientlysecure.keychain.*,1</item>
         <item>org.sufficientlysecure.localcalendar.*,0</item>
         <item>org.sufficientlysecure.viewer.*,3</item>
+        <item>org.supertuxkart.stk.*,4</item>
         <item>org.tasks.*,3</item>
         <item>org.telegram.messenger.*,1</item>
         <item>org.thoughtcrime.securesms.*,1</item>
@@ -162,6 +167,9 @@
         <item>org.xbmc.kore.*,3</item>
         <item>protect.card_locker.*,0</item>
         <item>tk.jordynsmediagroup.simpleirc.fdroid.*,0</item>
+        <item>to.noc.android.swipeyours.*,1</item>
+        <item>us.spotco.extirpater.*,1</item>
+        <item>us.spotco.maps.*,1</item>
         <!-- Proprietary Apps -->
         <item>com.a1dev.sdbench.*,2</item>
         <item>com.amazon.kindle.*,3</item>
diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh
index 63462001..d137d0e6 100755
--- a/Scripts/LineageOS-14.1/Patch.sh
+++ b/Scripts/LineageOS-14.1/Patch.sh
@@ -173,7 +173,7 @@ enter "packages/apps/Jelly"
 git apply --3way $patches"android_packages_apps_Jelly/182322-3.patch" #Add option to remove identifying headers
 
 enter "packages/apps/Settings"
-sed -i 's/private int mPasswordMaxLength = 16;/private int mPasswordMaxLength = 64;/' src/com/android/settings/ChooseLockPassword.java; #Increase max password length
+sed -i 's/private int mPasswordMaxLength = 16;/private int mPasswordMaxLength = 32;/' src/com/android/settings/ChooseLockPassword.java; #Increase max password length
 sed -i 's/GSETTINGS_PROVIDER = "com.google.settings";/GSETTINGS_PROVIDER = "com.google.oQuae4av";/' src/com/android/settings/PrivacySettings.java; #MicroG doesn't support Backup, hide the options
 
 enter "packages/apps/SetupWizard"
@@ -205,11 +205,10 @@ cat /tmp/ar/hosts >> rootdir/etc/hosts #Merge in our HOSTS file
 patch -p1 < $patches"android_system_core/0001-Harden_Mounts.patch" #Harden mounts with nodev/noexec/nosuid
 
 enter "system/vold"
-#THESE OPTIONS MUST NOT BE CHANGED AFTER RELEASE!
-#Android's cryptfs fully supports 256-bit
-#sed -i 's|define HASH_COUNT 2000|define HASH_COUNT 5000|' cryptfs.c; #Increase pbkdf iterations
+#THESE OPTIONS MUST *NOT* BE CHANGED AFTER RELEASE!
+#sed -i 's|define HASH_COUNT 2000|define HASH_COUNT 6000|' cryptfs.c; #Increase pbkdf iterations
 #sed -i 's|define KEY_LEN_BYTES 16|define KEY_LEN_BYTES 32|' cryptfs.c; #128-bit -> 256-bit
-#sed -i 's|define IV_LEN_BYTES 16|define IV_LEN_BYTES 32|' cryptfs.c; #AES-CBC IV must be the same as ^
+#sed -i 's|define IV_LEN_BYTES 16|define IV_LEN_BYTES 32|' cryptfs.c;
 #sed -i 's|define RSA_KEY_SIZE 2048|define RSA_KEY_SIZE 4096|' cryptfs.c; #Increase signning key size to 4096
 sed -i 's|define RETRY_MOUNT_DELAY_SECONDS 1|define RETRY_MOUNT_DELAY_SECONDS 3|' cryptfs.c;