From 8220c2fd111c76749462bf27c0d54c09432cbefe Mon Sep 17 00:00:00 2001 From: Tad Date: Sat, 28 Apr 2018 21:50:06 -0400 Subject: [PATCH] Prepare potential future inclusion of DNS66 --- .../android_vendor_cm/dns66.json | 168 ++++++++++++++++++ .../LineageOS-14.1/android_vendor_cm/sce.mk | 1 + .../android_vendor_lineage/dns66.json | 168 ++++++++++++++++++ .../android_vendor_lineage/sce.mk | 1 + PrebuiltApps | 2 +- Scripts/LineageOS-14.1/Patch.sh | 2 + Scripts/LineageOS-15.1/Patch.sh | 2 + 7 files changed, 343 insertions(+), 1 deletion(-) create mode 100755 Patches/LineageOS-14.1/android_vendor_cm/dns66.json create mode 100755 Patches/LineageOS-15.1/android_vendor_lineage/dns66.json diff --git a/Patches/LineageOS-14.1/android_vendor_cm/dns66.json b/Patches/LineageOS-14.1/android_vendor_cm/dns66.json new file mode 100755 index 00000000..db918c65 --- /dev/null +++ b/Patches/LineageOS-14.1/android_vendor_cm/dns66.json @@ -0,0 +1,168 @@ +{ + "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 - Spot Communications - GPLv3" + }, + { + "location": "https://spotco.us/blocklists/Experimental.txt", + "state": 0, + "title": "Ads - Spot Communications - 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/Patches/LineageOS-14.1/android_vendor_cm/sce.mk b/Patches/LineageOS-14.1/android_vendor_cm/sce.mk index c9c94d12..be3fe538 100644 --- a/Patches/LineageOS-14.1/android_vendor_cm/sce.mk +++ b/Patches/LineageOS-14.1/android_vendor_cm/sce.mk @@ -18,6 +18,7 @@ PRODUCT_PACKAGES += \ # Others PRODUCT_PACKAGES += \ CameraRoll \ +# DNS66 \ LocalCalendar # Browser diff --git a/Patches/LineageOS-15.1/android_vendor_lineage/dns66.json b/Patches/LineageOS-15.1/android_vendor_lineage/dns66.json new file mode 100755 index 00000000..db918c65 --- /dev/null +++ b/Patches/LineageOS-15.1/android_vendor_lineage/dns66.json @@ -0,0 +1,168 @@ +{ + "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 - Spot Communications - GPLv3" + }, + { + "location": "https://spotco.us/blocklists/Experimental.txt", + "state": 0, + "title": "Ads - Spot Communications - 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/Patches/LineageOS-15.1/android_vendor_lineage/sce.mk b/Patches/LineageOS-15.1/android_vendor_lineage/sce.mk index c9c94d12..be3fe538 100644 --- a/Patches/LineageOS-15.1/android_vendor_lineage/sce.mk +++ b/Patches/LineageOS-15.1/android_vendor_lineage/sce.mk @@ -18,6 +18,7 @@ PRODUCT_PACKAGES += \ # Others PRODUCT_PACKAGES += \ CameraRoll \ +# DNS66 \ LocalCalendar # Browser diff --git a/PrebuiltApps b/PrebuiltApps index 6ae6550c..d5a19c05 160000 --- a/PrebuiltApps +++ b/PrebuiltApps @@ -1 +1 @@ -Subproject commit 6ae6550c9237c43257f67078d31899f484f0b396 +Subproject commit d5a19c050de1586595062dc296cda164796ce1c6 diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh index ca0abb2d..099cdef9 100755 --- a/Scripts/LineageOS-14.1/Patch.sh +++ b/Scripts/LineageOS-14.1/Patch.sh @@ -184,6 +184,8 @@ cp -r $patches"android_vendor_cm/firmware_deblobber" .; cp $patches"android_vendor_cm/firmware_deblobber.mk" build/tasks/firmware_deblobber.mk; sed -i 's/CM_BUILDTYPE := UNOFFICIAL/CM_BUILDTYPE := dos/' config/common.mk; #Change buildtype sed -i 's/messaging/Silence/' config/telephony.mk; #Replace AOSP Messaging app with Silence +cp $patches"android_vendor_cm/dns66.json" prebuilt/common/etc/dns66.json; +sed -i '4iPRODUCT_COPY_FILES += vendor/cm/prebuilt/common/etc/dns66.json:system/etc/dns66.json' config/common.mk; #Include DNS66 default config enterAndClear "vendor/cmsdk"; awk -i inplace '!/WeatherManagerServiceBroker/' cm/res/res/values/config.xml; #Disable Weather diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh index 4e493d29..f8d73a54 100755 --- a/Scripts/LineageOS-15.1/Patch.sh +++ b/Scripts/LineageOS-15.1/Patch.sh @@ -186,6 +186,8 @@ cp -r $patches"android_vendor_lineage/firmware_deblobber" .; cp $patches"android_vendor_lineage/firmware_deblobber.mk" build/tasks/firmware_deblobber.mk; sed -i 's/LINEAGE_BUILDTYPE := UNOFFICIAL/LINEAGE_BUILDTYPE := dos/' config/common.mk; #Change buildtype sed -i 's/messaging/Silence/' config/telephony.mk; #Replace AOSP Messaging app with Silence +cp $patches"android_vendor_lineage/dns66.json" prebuilt/common/etc/dns66.json; +sed -i '4iPRODUCT_COPY_FILES += vendor/lineage/prebuilt/common/etc/dns66.json:system/etc/dns66.json' config/common.mk; #Include DNS66 default config # #END OF ROM CHANGES #