diff --git a/Patches/Common/android_vendor_divested/divestos.mk b/Patches/Common/android_vendor_divested/divestos.mk index 9da68c7e..c352fcf1 100644 --- a/Patches/Common/android_vendor_divested/divestos.mk +++ b/Patches/Common/android_vendor_divested/divestos.mk @@ -19,8 +19,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ ro.storage_manager.enabled=true #Copy extra files -PRODUCT_COPY_FILES += \ - vendor/divested/prebuilts/etc/dns66.json:system/etc/dns66/settings.json +#PRODUCT_COPY_FILES += \ # vendor/divested/prebuilts/etc/additional_fdroid_repos.xml:system/etc/org.fdroid.fdroid_dos/additional_repos.xml #Include packages diff --git a/Patches/Common/android_vendor_divested/packages.mk b/Patches/Common/android_vendor_divested/packages.mk index 835c3ac8..b7db7781 100644 --- a/Patches/Common/android_vendor_divested/packages.mk +++ b/Patches/Common/android_vendor_divested/packages.mk @@ -1,4 +1,4 @@ -# F-Droid +# F-Droid (source) PRODUCT_PACKAGES += \ F-Droid \ F-DroidPrivilegedExtension @@ -17,9 +17,9 @@ PRODUCT_PACKAGES += \ # Replacements PRODUCT_PACKAGES += \ - CameraRoll \ FennecDOS \ Silence \ + SimpleGallery \ VanillaMusic # Others @@ -27,8 +27,11 @@ PRODUCT_PACKAGES += \ LocalCalendar # Notes +# - Available: DNS66, K9Mail, NetMonitor, OpenKeychain, Shelter, TalkBack # - Official F-Droid will be included once #843 is implemented +# - $DOS_HOSTS_BLOCKING should become a tristate and support DNS66 # - K-9 Mail Will be included after 5.5xx release -# - OpenKeychain inclusion is undecided yet # - Net Monitor will be included after #58 is merged +# - OpenKeychain inclusion is undecided yet # - Orbot/Orfox will most likely never be included due to various reasons +# - microG needs to be added back to support $DOS_MICROG_INCLUDED="FULL" diff --git a/Patches/Common/android_vendor_divested/prebuilts/etc/dns66.json b/Patches/Common/android_vendor_divested/prebuilts/etc/dns66.json deleted file mode 100755 index 48efa04c..00000000 --- a/Patches/Common/android_vendor_divested/prebuilts/etc/dns66.json +++ /dev/null @@ -1,168 +0,0 @@ -{ - "autoStart": true, - "dnsServers": { - "enabled": false, - "items": [ - { - "location": "1.0.0.1", - "state": 1, - "title": "Cloudflare" - }, - { - "location": "2606:4700:4700::1111", - "state": 1, - "title": "Cloudflare" - }, - { - "location": "185.121.177.177", - "state": 0, - "title": "OpenNIC Anycast" - }, - { - "location": "2a05:dfc7:5::53", - "state": 0, - "title": "OpenNIC Anycast" - }, - { - "location": "84.200.79.80", - "state": 0, - "title": "DNS.WATCH" - }, - { - "location": "2001:1608:10:25::1c04:b12f", - "state": 0, - "title": "DNS.WATCH" - }, - { - "location": "8.8.8.8", - "state": 0, - "title": "Google" - }, - { - "location": "2001:4860:4860::8888", - "state": 0, - "title": "Google" - }, - { - "location": "208.67.222.222", - "state": 0, - "title": "OpenDNS" - }, - { - "location": "2620:0:ccc::2", - "state": 0, - "title": "OpenDNS" - }, - { - "location": "9.9.9.9", - "state": 0, - "title": "Quad9" - }, - { - "location": "2620:fe::fe", - "state": 0, - "title": "Quad9" - } - ] - }, - "hosts": { - "automaticRefresh": false, - "enabled": true, - "items": [ - { - "location": "https://s3.amazonaws.com/lists.disconnect.me/simple_ad.txt", - "state": 0, - "title": "Ads - Disconnect - GPLv3" - }, - { - "location": "https://hosts-file.net/ad_servers.txt", - "state": 2, - "title": "Ads - hpHosts - Unknown" - }, - { - "location": "http://www.winhelp2002.mvps.org/hosts.txt", - "state": 2, - "title": "Ads - MVPS - CC BY-NC-SA 3.0" - }, - { - "location": "https://pgl.yoyo.org/as/serverlist.php?hostformat=html&mimetype=plaintext", - "state": 2, - "title": "Ads - Peter Lowe's - Unknown" - }, - { - "location": "http://someonewhocares.org/hosts/hosts", - "state": 2, - "title": "Ads - someonewhocares - AS-IS NC" - }, - { - "location": "https://spotco.us/blocklists/Mobile.txt", - "state": 0, - "title": "Ads - Divested Computing, Inc. - GPLv3" - }, - { - "location": "https://spotco.us/blocklists/Experimental.txt", - "state": 0, - "title": "Ads - Divested Computing, Inc. - MIT" - }, - { - "location": "https://ransomwaretracker.abuse.ch/downloads/RW_DOMBL.txt", - "state": 2, - "title": "Malware - Abuse.ch - AS-IS" - }, - { - "location": "https://osint.bambenekconsulting.com/feeds/c2-dommasterlist.txt", - "state": 2, - "title": "Malware - Bambenek - AS-IS" - }, - { - "location": "https://s3.amazonaws.com/lists.disconnect.me/simple_malware.txt", - "state": 0, - "title": "Malware - Disconnect - GPLv3" - }, - { - "location": "https://s3.amazonaws.com/lists.disconnect.me/simple_malvertising.txt", - "state": 0, - "title": "Malware - Disconnect - GPLv3" - }, - { - "location": "https://dshield.org/feeds/suspiciousdomains_Low.txt", - "state": 2, - "title": "Malware - DShield - CC BY-NC-SA 2.5" - }, - { - "location": "https://www.malwaredomainlist.com/hostslist/hosts.txt", - "state": 2, - "title": "Malware - Malware Domain List - Unknown" - }, - { - "location": "https://mirror.cedia.org.ec/malwaredomains/justdomains", - "state": 2, - "title": "Malware - Malware Domains - Unknown" - }, - { - "location": "https://raw.githubusercontent.com/Dawsey21/Lists/master/main-blacklist.txt", - "state": 0, - "title": "Spam - Spam404 - CC BY-SA 4.0" - }, - { - "location": "https://s3.amazonaws.com/lists.disconnect.me/simple_tracking.txt", - "state": 0, - "title": "Tracking - Disconnect - GPLv3" - } - ] - }, - "ipV6Support": true, - "nightMode": false, - "showNotification": true, - "version": 1, - "watchDog": false, - "whitelist": { - "defaultMode": 2, - "items": [ - "com.android.vending" - ], - "itemsOnVpn": [], - "showSystemApps": false - } -} - diff --git a/PrebuiltApps b/PrebuiltApps index a5eca1e6..85565adb 160000 --- a/PrebuiltApps +++ b/PrebuiltApps @@ -1 +1 @@ -Subproject commit a5eca1e6b88df653b3da6f13812f3bab5c2f19aa +Subproject commit 85565adbc051a59bb0da8a138456d4f2a06d8296