mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-10-01 01:35:54 -04:00
Update F-Droid repos patch and update network traffic cherry picks
This commit is contained in:
Tad
parent
df959d5fa6
commit
5d7e5735fd
@ -1,17 +1,53 @@
|
||||
From de03f9cb91b9882a6222a17edcfcad556a56cadb Mon Sep 17 00:00:00 2001
|
||||
From 2e71f0eb4a0ac20f52531a4569bf94e10beeaa2b Mon Sep 17 00:00:00 2001
|
||||
From: Tad <tad@spotco.us>
|
||||
Date: Sat, 10 Jun 2017 10:01:03 -0400
|
||||
Subject: [PATCH] Add Izzy and microG repos
|
||||
Date: Mon, 12 Jun 2017 10:39:55 -0400
|
||||
Subject: [PATCH] Add more repos and update versions
|
||||
|
||||
---
|
||||
app/src/main/res/values/default_repos.xml | 40 +++++++++++++++++++++++++++++++
|
||||
1 file changed, 40 insertions(+)
|
||||
app/src/main/res/values/default_repos.xml | 68 +++++++++++++++++++++++++++++--
|
||||
1 file changed, 64 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/app/src/main/res/values/default_repos.xml b/app/src/main/res/values/default_repos.xml
|
||||
index 3a895f57..7ada7490 100644
|
||||
index 3a895f57..eed97fa7 100644
|
||||
--- a/app/src/main/res/values/default_repos.xml
|
||||
+++ b/app/src/main/res/values/default_repos.xml
|
||||
@@ -89,6 +89,46 @@
|
||||
@@ -13,7 +13,7 @@
|
||||
application developers - these will be replaced by source-built versions over time.
|
||||
</item>
|
||||
<!-- version -->
|
||||
- <item>13</item>
|
||||
+ <item>18</item>
|
||||
<!-- enabled -->
|
||||
<item>1</item>
|
||||
<!-- priority -->
|
||||
@@ -34,7 +34,7 @@
|
||||
applications from the main repository.
|
||||
</item>
|
||||
<!-- version -->
|
||||
- <item>13</item>
|
||||
+ <item>18</item>
|
||||
<!-- enabled -->
|
||||
<item>0</item>
|
||||
<!-- priority -->
|
||||
@@ -56,7 +56,7 @@
|
||||
same key as the APKs that are released in the Google Play store.
|
||||
</item>
|
||||
<!-- version -->
|
||||
- <item>13</item>
|
||||
+ <item>18</item>
|
||||
<!-- enabled -->
|
||||
<item>0</item>
|
||||
<!-- priority -->
|
||||
@@ -77,7 +77,7 @@
|
||||
contains older versions of applications from the main repository.
|
||||
</item>
|
||||
<!-- version -->
|
||||
- <item>13</item>
|
||||
+ <item>18</item>
|
||||
<!-- enabled -->
|
||||
<item>0</item>
|
||||
<!-- priority -->
|
||||
@@ -89,6 +89,66 @@
|
||||
308205d8308203c0020900a397b4da7ecda034300d06092a864886f70d01010505003081ad310b30090603550406130255533111300f06035504080c084e657720596f726b3111300f06035504070c084e657720596f726b31143012060355040b0c0b4644726f6964205265706f31193017060355040a0c10477561726469616e2050726f6a656374311d301b06035504030c14677561726469616e70726f6a6563742e696e666f3128302606092a864886f70d0109011619726f6f7440677561726469616e70726f6a6563742e696e666f301e170d3134303632363139333931385a170d3431313131303139333931385a3081ad310b30090603550406130255533111300f06035504080c084e657720596f726b3111300f06035504070c084e657720596f726b31143012060355040b0c0b4644726f6964205265706f31193017060355040a0c10477561726469616e2050726f6a656374311d301b06035504030c14677561726469616e70726f6a6563742e696e666f3128302606092a864886f70d0109011619726f6f7440677561726469616e70726f6a6563742e696e666f30820222300d06092a864886f70d01010105000382020f003082020a0282020100b3cd79121b9b883843be3c4482e320809106b0a23755f1dd3c7f46f7d315d7bb2e943486d61fc7c811b9294dcc6b5baac4340f8db2b0d5e14749e7f35e1fc211fdbc1071b38b4753db201c314811bef885bd8921ad86facd6cc3b8f74d30a0b6e2e6e576f906e9581ef23d9c03e926e06d1f033f28bd1e21cfa6a0e3ff5c9d8246cf108d82b488b9fdd55d7de7ebb6a7f64b19e0d6b2ab1380a6f9d42361770d1956701a7f80e2de568acd0bb4527324b1e0973e89595d91c8cc102d9248525ae092e2c9b69f7414f724195b81427f28b1d3d09a51acfe354387915fd9521e8c890c125fc41a12bf34d2a1b304067ab7251e0e9ef41833ce109e76963b0b256395b16b886bca21b831f1408f836146019e7908829e716e72b81006610a2af08301de5d067c9e114a1e5759db8a6be6a3cc2806bcfe6fafd41b5bc9ddddb3dc33d6f605b1ca7d8a9e0ecdd6390d38906649e68a90a717bea80fa220170eea0c86fc78a7e10dac7b74b8e62045a3ecca54e035281fdc9fe5920a855fde3c0be522e3aef0c087524f13d973dff3768158b01a5800a060c06b451ec98d627dd052eda804d0556f60dbc490d94e6e9dea62ffcafb5beffbd9fc38fb2f0d7050004fe56b4dda0a27bc47554e1e0a7d764e17622e71f83a475db286bc7862deee1327e2028955d978272ea76bf0b88e70a18621aba59ff0c5993ef5f0e5d6b6b98e68b70203010001300d06092a864886f70d0101050500038202010079c79c8ef408a20d243d8bd8249fb9a48350dc19663b5e0fce67a8dbcb7de296c5ae7bbf72e98a2020fb78f2db29b54b0e24b181aa1c1d333cc0303685d6120b03216a913f96b96eb838f9bff125306ae3120af838c9fc07ebb5100125436bd24ec6d994d0bff5d065221871f8410daf536766757239bf594e61c5432c9817281b985263bada8381292e543a49814061ae11c92a316e7dc100327b59e3da90302c5ada68c6a50201bda1fcce800b53f381059665dbabeeb0b50eb22b2d7d2d9b0aa7488ca70e67ac6c518adb8e78454a466501e89d81a45bf1ebc350896f2c3ae4b6679ecfbf9d32960d4f5b493125c7876ef36158562371193f600bc511000a67bdb7c664d018f99d9e589868d103d7e0994f166b2ba18ff7e67d8c4da749e44dfae1d930ae5397083a51675c409049dfb626a96246c0015ca696e94ebb767a20147834bf78b07fece3f0872b057c1c519ff882501995237d8206b0b3832f78753ebd8dcbd1d3d9f5ba733538113af6b407d960ec4353c50eb38ab29888238da843cd404ed8f4952f59e4bbc0035fc77a54846a9d419179c46af1b4a3b7fc98e4d312aaa29b9b7d79e739703dc0fa41c7280d5587709277ffa11c3620f5fba985b82c238ba19b17ebd027af9424be0941719919f620dd3bb3c3f11638363708aa11f858e153cf3a69bce69978b90e4a273836100aa1e617ba455cd00426847f
|
||||
</item>
|
||||
|
||||
@ -23,7 +59,7 @@ index 3a895f57..7ada7490 100644
|
||||
+ <item>This is a repository of apps to be used with F-Droid. Applications in this repository are official binaries built by the original application developers, taken from their resp. repositories (mostly Github). At this moment I cannot give guarantees on regular updates for all of them, though most are checked multiple times a week.
|
||||
+ </item>
|
||||
+ <!-- version -->
|
||||
+ <item>13</item>
|
||||
+ <item>17</item>
|
||||
+ <!-- enabled -->
|
||||
+ <item>0</item>
|
||||
+ <!-- priority -->
|
||||
@ -43,7 +79,7 @@ index 3a895f57..7ada7490 100644
|
||||
+ <item>This is a repository of microG apps to be used with F-Droid. Applications in this repository are signed official binaries built by the microG Team from the corresponding source code.
|
||||
+ </item>
|
||||
+ <!-- version -->
|
||||
+ <item>13</item>
|
||||
+ <item>17</item>
|
||||
+ <!-- enabled -->
|
||||
+ <item>0</item>
|
||||
+ <!-- priority -->
|
||||
@ -54,6 +90,26 @@ index 3a895f57..7ada7490 100644
|
||||
+ <item>
|
||||
+ 308202ed308201d5a003020102020426ffa009300d06092a864886f70d01010b05003027310b300906035504061302444531183016060355040a130f4e4f47415050532050726f6a656374301e170d3132313030363132303533325a170d3337303933303132303533325a3027310b300906035504061302444531183016060355040a130f4e4f47415050532050726f6a65637430820122300d06092a864886f70d01010105000382010f003082010a02820101009a8d2a5336b0eaaad89ce447828c7753b157459b79e3215dc962ca48f58c2cd7650df67d2dd7bda0880c682791f32b35c504e43e77b43c3e4e541f86e35a8293a54fb46e6b16af54d3a4eda458f1a7c8bc1b7479861ca7043337180e40079d9cdccb7e051ada9b6c88c9ec635541e2ebf0842521c3024c826f6fd6db6fd117c74e859d5af4db04448965ab5469b71ce719939a06ef30580f50febf96c474a7d265bb63f86a822ff7b643de6b76e966a18553c2858416cf3309dd24278374bdd82b4404ef6f7f122cec93859351fc6e5ea947e3ceb9d67374fe970e593e5cd05c905e1d24f5a5484f4aadef766e498adf64f7cf04bddd602ae8137b6eea40722d0203010001a321301f301d0603551d0e04160414110b7aa9ebc840b20399f69a431f4dba6ac42a64300d06092a864886f70d01010b0500038201010007c32ad893349cf86952fb5a49cfdc9b13f5e3c800aece77b2e7e0e9c83e34052f140f357ec7e6f4b432dc1ed542218a14835acd2df2deea7efd3fd5e8f1c34e1fb39ec6a427c6e6f4178b609b369040ac1f8844b789f3694dc640de06e44b247afed11637173f36f5886170fafd74954049858c6096308fc93c1bc4dd5685fa7a1f982a422f2a3b36baa8c9500474cf2af91c39cbec1bc898d10194d368aa5e91f1137ec115087c31962d8f76cd120d28c249cf76f4c70f5baa08c70a7234ce4123be080cee789477401965cfe537b924ef36747e8caca62dfefdd1a6288dcb1c4fd2aaa6131a7ad254e9742022cfd597d2ca5c660ce9e41ff537e5a4041e37
|
||||
+ </item>
|
||||
+
|
||||
+ <!-- name -->
|
||||
+ <item>Eutopia.cz</item>
|
||||
+ <!-- address -->
|
||||
+ <item>https://eutopia.cz/fdroid/repo/</item>
|
||||
+ <!-- description -->
|
||||
+ <item>The official F-Droid app repository of the Eutopia.cz website. Applications in this repository are built directly from the source code.
|
||||
+ </item>
|
||||
+ <!-- version -->
|
||||
+ <item>18</item>
|
||||
+ <!-- enabled -->
|
||||
+ <item>0</item>
|
||||
+ <!-- priority -->
|
||||
+ <item>7</item>
|
||||
+ <!-- push requests -->
|
||||
+ <item>ignore</item>
|
||||
+ <!-- pubkey -->
|
||||
+ <item>
|
||||
+ 308205353082031da00302010202045e5567d2300d06092a864886f70d01010b0500304b310b300906035504061302435a310f300d0603550407130650726167756531133011060355040a130a6575746f7069612e637a311630140603550403130d4d696368616c204b72656e656b301e170d3135303632323133323534395a170d3432313130373133323534395a304b310b300906035504061302435a310f300d0603550407130650726167756531133011060355040a130a6575746f7069612e637a311630140603550403130d4d696368616c204b72656e656b30820222300d06092a864886f70d01010105000382020f003082020a0282020100ac3f357b4ef6422ecbd6a15183ef03b5ea464c032a12a4e61ad1bd530fad87e26c75e14332363ec3dc423618b9eb2e15918e516c99a5467c2719f15f263098caa7e0943a7952f1b39ee82093e156cf153c0213fe94084567b8a2a0e67d6ea0a04af4981d37ee7230f10f4c38c76ba57add37126f9f1b3f18a99c342ce4f85f79d9209bcbd016c434a47927aafc32bafaa304af6bfa0405063c1f3c0d7bd820f2c4884c2fbebf29ae2df3e701238ff96dfb3027d597c5474995eae5580bee3cad1c4fb18678606529afccee0a164a5b3932102779905428528bee178e85145066c40b477b41162cc7f15e78cc768b93ea0f5d109f55bbbad1873304955868b574ea6ccec637dbe2cf87ff55e413fa270c1a9b9624a81e4e0eb1be8e5ad92098872a64b8a09608531005bb727ad7b7afc0713e3d9b87153ec9e2f1231a32756fb547f77ae5937012dbdb0af6ab58cae34b0775d88984d9d5fe3a025500f339a641daacc4629b73c497b3b3adfbdb0bb48c1a610d55eb1bb785bece2a20f26f97b9d279f231a52dc8661eb0a82a41e6aaf511cc71ce5643efffb423beea518631938f914492c3c59358c276f80af8939ee5d03b2e6685e8ec4c2703cb8d6cb48de16531dba44742af1f6715af2e64ad5a75db1882141765f559d68ccc8e7cd4e623c077312276e0b1ca61690b229fbb7a7a1f57263cdad4303b1d2e08e04e63678f0203010001a321301f301d0603551d0e041604144127532a7739d68b8a9730e0a4e13a36b3aa1c0b300d06092a864886f70d01010b0500038202010088b9cf4d34a0c1ee98340e3c3b863c35b58462fad42795796c710752368c33e233bf88a2f02cd4eb1f7eafb5f54b714cf74a2f786e1787dfceb04f9d3148ac92fcd39f9d35930b627808827bea148877b151cd80dbbbb53db6889560f14b2e21c29d091d967c60f736781161b44c4dce9a0afb10f1795476f6c8b90fba6c8dbfaa6ecc05bf742f90773e97ff9f2a183c71605fa205465ff8d688b14700e75b76c19d3a868ee2858bf86c3339b34e66280c93bd59b34adf35c8ab84807dffca0acb29d095f72dbb89f741e1d261c27d8e2a55a8974525d5aafb1289eac5bce980b447fb971d64d86299a6e572870b29149e11f3cdd22a3b9a6b72ae322cf1f66891737583a0709db7d8ef10b30b88efa805b2274064ffb509417a84e29d13474e3f638bd9953f9cd8c88439f5840862078d14ba084017f0b32b31c1ed35d404020eb32a04c8783749dc1c9ccf56506f09a626fb532d6fcc13c446293141be09b1fdc23bd5acd1ccac78a05b9943d1049c3475eb53136884c48d9dc1ed930eafb830d0a529e782dca340cd5676c0ff81a368466d81e5a4339054235d81176aa7d76e03b6d5be904151ef6fc6d3a426bbba97e4b73ba7f18989776e803d5826915a1437615cfba1c27503f57320accecbc4d35f7ab930ff6ebb6ec051c0877211ec1ba1271ba1c4cf19ca85d5b49dba8108e2c37965ad175fa32a3c7a6803240031
|
||||
+ </item>
|
||||
+
|
||||
</string-array>
|
||||
|
||||
|
||||
@ -19,7 +19,7 @@ patches="/mnt/Drive-1/Development/Other/Android_ROMs/Patches/LineageOS-14.1/"
|
||||
ANDROID_HOME="/home/$USER/Android/Sdk"
|
||||
|
||||
#Download some out-of-tree files for use later on
|
||||
mkdir -p /tmp/ar
|
||||
mkdir /tmp/ar
|
||||
cd /tmp/ar
|
||||
wget https://spotco.us/hosts -N #XXX: /hosts is built from non-commercial use files, switch to /hsc for release
|
||||
wget https://github.com/emojione/emojione/raw/master/extras/fonts/emojione-android.ttf -N #XXX: Requires attribuition
|
||||
@ -54,7 +54,6 @@ disableDexPreOpt() {
|
||||
#START OF ROM CHANGES
|
||||
#
|
||||
enter "build"
|
||||
#git revert 6f9c2e115aeccd7090f92f1fb91bc6052522cdd1 #Enable dex pre-optimization by default again
|
||||
patch -p1 < $patches"android_build/0001-Automated_Build_Signing.patch" #Automated build signing
|
||||
sed -i 's|echo "ro.build.user=$USER"|echo "ro.build.user=emy"|' tools/buildinfo.sh; #Override build user
|
||||
sed -i 's|echo "ro.build.host=`hostname`"|echo "ro.build.host=dosbm"|' tools/buildinfo.sh; #Override build host
|
||||
@ -73,7 +72,7 @@ patch -p1 < $patches"android_external_svox/94d2ddb.diff" #Fix garbled output See
|
||||
|
||||
enter "frameworks/base"
|
||||
git revert 0326bb5e41219cf502727c3aa44ebf2daa19a5b3 #re-enable doze on devices without gms
|
||||
git fetch https://review.lineageos.org/LineageOS/android_frameworks_base refs/changes/75/151975/31 && git cherry-pick FETCH_HEAD #network traffic
|
||||
git fetch https://review.lineageos.org/LineageOS/android_frameworks_base refs/changes/75/151975/32 && git cherry-pick FETCH_HEAD #network traffic
|
||||
sed -i 's/DEFAULT_MAX_FILES = 1000;/DEFAULT_MAX_FILES = 0;/' services/core/java/com/android/server/DropBoxManagerService.java; #Disable DropBox
|
||||
patch -p1 < $patches"android_frameworks_base/0003-Signature_Spoofing.patch" #Allow packages to spoof their signature (MicroG)
|
||||
patch -p1 < $patches"android_frameworks_base/0005-Harden_Sig_Spoofing.patch" #Restrict signature spoofing to system apps signed with the platform key
|
||||
@ -85,7 +84,7 @@ rm core/res/res/values/config.xml.orig core/res/res/values/strings.xml.orig core
|
||||
|
||||
enter "packages/apps/CMParts"
|
||||
rm -rf src/org/cyanogenmod/cmparts/cmstats/ res/xml/anonymous_stats.xml res/xml/preview_data.xml #Nuke part of CMStats
|
||||
git fetch https://review.lineageos.org/LineageOS/android_packages_apps_CMParts refs/changes/15/113415/23 && git cherry-pick FETCH_HEAD #network traffic
|
||||
git fetch https://review.lineageos.org/LineageOS/android_packages_apps_CMParts refs/changes/15/113415/24 && git cherry-pick FETCH_HEAD #network traffic
|
||||
patch -p1 < $patches"android_packages_apps_CMParts/0001-Remove_Analytics.patch" #Remove the rest of CMStats
|
||||
|
||||
enter "packages/apps/CMUpdater"
|
||||
@ -141,7 +140,7 @@ cp $patches"android_vendor_cm/sce.mk" config/sce.mk
|
||||
sed -i 's/CM_BUILDTYPE := UNOFFICIAL/CM_BUILDTYPE := dos/' config/common.mk; #Change buildtype
|
||||
|
||||
enter "vendor/cmsdk"
|
||||
git fetch https://review.lineageos.org/LineageOS/cm_platform_sdk refs/changes/21/148321/12 && git cherry-pick FETCH_HEAD #network traffic
|
||||
git fetch https://review.lineageos.org/LineageOS/cm_platform_sdk refs/changes/21/148321/13 && git cherry-pick FETCH_HEAD #network traffic
|
||||
cp $patches"cm_platform_sdk/profile_default.xml" cm/res/res/xml/profile_default.xml; #Replace default profiles with *way* better ones
|
||||
#
|
||||
#END OF ROM CHANGES
|
||||
|
||||
Loading…
Reference in New Issue
Block a user