Git-Mirrors/DivestOS
1
0
Fork 0
mirror of https://github.com/Divested-Mobile/DivestOS-Build.git synced 2024-10-01 01:35:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Few changes

Browse Source 
- Fix F-Droid building
- Update F-Droid preferences
- Add privacy policy links for DNS presets
This commit is contained in:
Tad 2018-06-25 19:15:22 -04:00
parent ee4ea5072b
commit 3e931219df
6 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Scripts/Common/Functions.sh
View File

@ -208,37 +208,42 @@ changeDefaultDNS() {
dnsSecondary=""; dnsSecondary="";
dnsSecondaryV6=""; dnsSecondaryV6="";
if [ -z "$DNS_PRESET"]; then if [ -z "$DNS_PRESET"]; then
if [[ "$DEFAULT_DNS_PRESET" == "Cloudflare" ]]; then if [[ "$DEFAULT_DNS_PRESET" == "Cloudflare" ]]; then #https://developers.cloudflare.com/1.1.1.1/commitment-to-privacy/privacy-policy/privacy-policy/
dnsPrimary="1.0.0.1"; dnsPrimary="1.0.0.1";
dnsPrimaryV6="2606:4700:4700::1001"; dnsPrimaryV6="2606:4700:4700::1001";
dnsSecondary="1.1.1.1"; dnsSecondary="1.1.1.1";
dnsSecondaryV6="2606:4700:4700::1111"; dnsSecondaryV6="2606:4700:4700::1111";
elif [[ "$DEFAULT_DNS_PRESET" == "OpenNIC" ]]; then elif [[ "$DEFAULT_DNS_PRESET" == "OpenNIC" ]]; then #https://servers.opennicproject.org/edit.php?srv=ns3.any.dns.opennic.glue
dnsPrimary="169.239.202.202"; dnsPrimary="169.239.202.202";
dnsPrimaryV6="2a05:dfc7:5353::53"; dnsPrimaryV6="2a05:dfc7:5353::53";
dnsSecondary="185.121.177.177"; dnsSecondary="185.121.177.177";
dnsSecondaryV6="2a05:dfc7:5::53"; dnsSecondaryV6="2a05:dfc7:5::53";
elif [[ "$DEFAULT_DNS_PRESET" == "DNSWATCH" ]]; then elif [[ "$DEFAULT_DNS_PRESET" == "DNSWATCH" ]]; then #https://dns.watch
dnsPrimary="84.200.69.80"; dnsPrimary="84.200.69.80";
dnsPrimaryV6="2001:1608:10:25::1c04:b12f"; dnsPrimaryV6="2001:1608:10:25::1c04:b12f";
dnsSecondary="84.200.70.40"; dnsSecondary="84.200.70.40";
dnsSecondaryV6="2001:1608:10:25::9249:d69b"; dnsSecondaryV6="2001:1608:10:25::9249:d69b";
elif [[ "$DEFAULT_DNS_PRESET" == "Google" ]]; then elif [[ "$DEFAULT_DNS_PRESET" == "Google" ]]; then #https://developers.google.com/speed/public-dns/privacy
dnsPrimary="8.8.8.8"; dnsPrimary="8.8.8.8";
dnsPrimaryV6="2001:4860:4860::8888"; dnsPrimaryV6="2001:4860:4860::8888";
dnsSecondary="8.8.4.4"; dnsSecondary="8.8.4.4";
dnsSecondaryV6="2001:4860:4860::8844"; dnsSecondaryV6="2001:4860:4860::8844";
elif [[ "$DEFAULT_DNS_PRESET" == "OpenDNS" ]]; then elif [[ "$DEFAULT_DNS_PRESET" == "OpenDNS" ]]; then #https://www.cisco.com/c/en/us/about/legal/privacy-full.html
dnsPrimary="208.67.222.222"; dnsPrimary="208.67.222.222";
dnsPrimaryV6="2620:0:ccc::2"; dnsPrimaryV6="2620:0:ccc::2";
dnsSecondary="208.67.220.220"; dnsSecondary="208.67.220.220";
dnsSecondaryV6="2620:0:ccd::2"; dnsSecondaryV6="2620:0:ccd::2";
elif [[ "$DEFAULT_DNS_PRESET" == "Quad9" ]]; then elif [[ "$DEFAULT_DNS_PRESET" == "Quad9" ]]; then #https://www.quad9.net/privacy/
dnsPrimary="9.9.9.9"; dnsPrimary="9.9.9.9";
dnsPrimaryV6="2620:fe::fe"; dnsPrimaryV6="2620:fe::fe";
dnsSecondary="149.112.112.112"; dnsSecondary="149.112.112.112";
dnsSecondaryV6="2620:fe::10"; #not real secondary, primary "unsecured" dnsSecondaryV6="2620:fe::fe"; #no secondary available
elif [[ "$DEFAULT_DNS_PRESET" == "Verisign" ]]; then elif [[ "$DEFAULT_DNS_PRESET" == "Quad9U" ]]; then #https://www.quad9.net/privacy/
dnsPrimary="9.9.9.10";
dnsPrimaryV6="2620:fe::10";
dnsSecondary="149.112.112.10";
dnsSecondaryV6="2620:fe::10"; #no secondary available
elif [[ "$DEFAULT_DNS_PRESET" == "Verisign" ]]; then #https://www.verisign.com/en_US/security-services/public-dns/terms-of-service/index.xhtml
dnsPrimary="64.6.64.6"; dnsPrimary="64.6.64.6";
dnsPrimaryV6="2620:74:1b::1:1"; dnsPrimaryV6="2620:74:1b::1:1";
dnsSecondary="64.6.65.6"; dnsSecondary="64.6.65.6";

2
Scripts/LineageOS-14.1/Defaults.sh
View File

@ -46,9 +46,7 @@ sed -i 's/ENABLE_PEOPLE_LOOKUP, 1)/ENABLE_PEOPLE_LOOKUP, 0)/' src/com/android/di
sed -i 's/ENABLE_REVERSE_LOOKUP, 1)/ENABLE_REVERSE_LOOKUP, 0)/' src/com/android/dialer/*/LookupSettings*.java; #Disable RLP sed -i 's/ENABLE_REVERSE_LOOKUP, 1)/ENABLE_REVERSE_LOOKUP, 0)/' src/com/android/dialer/*/LookupSettings*.java; #Disable RLP
enter "packages/apps/FDroid"; enter "packages/apps/FDroid";
sed -i 's|DEFAULT_SHOW_ROOT_APPS = true;|DEFAULT_SHOW_ROOT_APPS = false;|' app/src/main/java/org/fdroid/fdroid/Preferences.java; #Hide root apps
sed -i '/string\/show_root_apps/!b;n;s/defaultValue="true"/defaultValue="false"/' app/src/main/res/xml/preferences.xml; sed -i '/string\/show_root_apps/!b;n;s/defaultValue="true"/defaultValue="false"/' app/src/main/res/xml/preferences.xml;
sed -i 's|DEFAULT_SHOW_ANTI_FEATURE_APPS = true;|DEFAULT_SHOW_ANTI_FEATURE_APPS = false;|' app/src/main/java/org/fdroid/fdroid/Preferences.java; #Hide anti-feature apps
sed -i '/string\/show_anti_feature_apps/!b;n;s/defaultValue="true"/defaultValue="false"/' app/src/main/res/xml/preferences.xml; sed -i '/string\/show_anti_feature_apps/!b;n;s/defaultValue="true"/defaultValue="false"/' app/src/main/res/xml/preferences.xml;
enter "packages/apps/Nfc"; enter "packages/apps/Nfc";

3
Scripts/LineageOS-14.1/Patch.sh
View File

@ -119,7 +119,8 @@ fi;
enterAndClear "packages/apps/FDroid"; enterAndClear "packages/apps/FDroid";
cp "$patchesCommon/android_packages_apps_FDroid/default_repos.xml" app/src/main/res/values/default_repos.xml; #Add extra repos cp "$patchesCommon/android_packages_apps_FDroid/default_repos.xml" app/src/main/res/values/default_repos.xml; #Add extra repos
sed -i 's|outputs/apk/|outputs/apk/release/|' Android.mk; sed -i 's|outputs/apk/|outputs/apk/full/release/|' Android.mk;
sed -i 's|-release-unsigned|-full-release-unsigned|' Android.mk;
sed -i 's|gradle|./gradlew|' Android.mk; #Gradle 4.0 fix sed -i 's|gradle|./gradlew|' Android.mk; #Gradle 4.0 fix
sed -i 's|/$(fdroid_dir) \&\&| \&\&|' Android.mk; #One line wouldn't work... no matter what I tried. sed -i 's|/$(fdroid_dir) \&\&| \&\&|' Android.mk; #One line wouldn't work... no matter what I tried.
sed -i 's/org\.fdroid\.fdroid/org.fdroid.fdroid_dos/' app/build.gradle; #Change the package ID until https://gitlab.com/fdroid/fdroidclient/issues/843 is implemented sed -i 's/org\.fdroid\.fdroid/org.fdroid.fdroid_dos/' app/build.gradle; #Change the package ID until https://gitlab.com/fdroid/fdroidclient/issues/843 is implemented

2
Scripts/LineageOS-15.1/Defaults.sh
View File

@ -52,9 +52,7 @@ sed -i 's/ENABLE_PEOPLE_LOOKUP, 1)/ENABLE_PEOPLE_LOOKUP, 0)/' java/com/android/d
sed -i 's/ENABLE_REVERSE_LOOKUP, 1)/ENABLE_REVERSE_LOOKUP, 0)/' java/com/android/dialer/lookup/LookupSettings*.java; #Disable RLP sed -i 's/ENABLE_REVERSE_LOOKUP, 1)/ENABLE_REVERSE_LOOKUP, 0)/' java/com/android/dialer/lookup/LookupSettings*.java; #Disable RLP
enter "packages/apps/FDroid"; enter "packages/apps/FDroid";
sed -i 's|DEFAULT_SHOW_ROOT_APPS = true;|DEFAULT_SHOW_ROOT_APPS = false;|' app/src/main/java/org/fdroid/fdroid/Preferences.java; #Hide root apps
sed -i '/string\/show_root_apps/!b;n;s/defaultValue="true"/defaultValue="false"/' app/src/main/res/xml/preferences.xml; sed -i '/string\/show_root_apps/!b;n;s/defaultValue="true"/defaultValue="false"/' app/src/main/res/xml/preferences.xml;
sed -i 's|DEFAULT_SHOW_ANTI_FEATURE_APPS = true;|DEFAULT_SHOW_ANTI_FEATURE_APPS = false;|' app/src/main/java/org/fdroid/fdroid/Preferences.java; #Hide anti-feature apps
sed -i '/string\/show_anti_feature_apps/!b;n;s/defaultValue="true"/defaultValue="false"/' app/src/main/res/xml/preferences.xml; sed -i '/string\/show_anti_feature_apps/!b;n;s/defaultValue="true"/defaultValue="false"/' app/src/main/res/xml/preferences.xml;
enter "packages/apps/Nfc"; enter "packages/apps/Nfc";

3
Scripts/LineageOS-15.1/Patch.sh
View File

@ -119,7 +119,8 @@ fi;
enterAndClear "packages/apps/FDroid"; enterAndClear "packages/apps/FDroid";
cp "$patchesCommon/android_packages_apps_FDroid/default_repos.xml" app/src/main/res/values/default_repos.xml; #Add extra repos cp "$patchesCommon/android_packages_apps_FDroid/default_repos.xml" app/src/main/res/values/default_repos.xml; #Add extra repos
sed -i 's|outputs/apk/|outputs/apk/release/|' Android.mk; sed -i 's|outputs/apk/|outputs/apk/full/release/|' Android.mk;
sed -i 's|-release-unsigned|-full-release-unsigned|' Android.mk;
sed -i 's|gradle|./gradlew|' Android.mk; #Gradle 4.0 fix sed -i 's|gradle|./gradlew|' Android.mk; #Gradle 4.0 fix
sed -i 's|/$(fdroid_dir) \&\&| \&\&|' Android.mk; #One line wouldn't work... no matter what I tried. sed -i 's|/$(fdroid_dir) \&\&| \&\&|' Android.mk; #One line wouldn't work... no matter what I tried.
sed -i 's/org\.fdroid\.fdroid/org.fdroid.fdroid_dos/' app/build.gradle; #Change the package ID until https://gitlab.com/fdroid/fdroidclient/issues/843 is implemented sed -i 's/org\.fdroid\.fdroid/org.fdroid.fdroid_dos/' app/build.gradle; #Change the package ID until https://gitlab.com/fdroid/fdroidclient/issues/843 is implemented

2
Scripts/init.sh
View File

@ -23,7 +23,7 @@ export androidWorkspace="/mnt/Drive-3/"; #XXX: THIS MUST BE CORRECT TO BUILD!
export DEBLOBBER_REMOVE_AUDIOFX=true; #Set true to remove AudioFX export DEBLOBBER_REMOVE_AUDIOFX=true; #Set true to remove AudioFX
export DEBLOBBER_REMOVE_IMS=false; #Set true to remove all IMS blobs export DEBLOBBER_REMOVE_IMS=false; #Set true to remove all IMS blobs
export DEBLOBBER_REPLACE_TIME=false; #Set true to replace Qualcomm Time Services with the open source Sony TimeKeep reimplementation export DEBLOBBER_REPLACE_TIME=false; #Set true to replace Qualcomm Time Services with the open source Sony TimeKeep reimplementation
export DEFAULT_DNS_PRESET="OpenNIC"; #Sets default DNS. Options: Cloudflare, OpenNIC, DNSWATCH, Google, OpenDNS, Quad9, Verisign export DEFAULT_DNS_PRESET="OpenNIC"; #Sets default DNS. Options: Cloudflare, OpenNIC, DNSWATCH, Google, OpenDNS, Quad9, Quad9U, Verisign
export GLONASS_FORCED_ENABLE=true; #Enables GLONASS on all devices export GLONASS_FORCED_ENABLE=true; #Enables GLONASS on all devices
export MALWARE_SCAN_ENABLED=true; #Set true to perform a fast scan on patchWorkspace() and a through scan on buildAll() export MALWARE_SCAN_ENABLED=true; #Set true to perform a fast scan on patchWorkspace() and a through scan on buildAll()
export MALWARE_SCAN_SETTING="quick"; #buildAll() scan speed. Options: quick, extra, slow, full export MALWARE_SCAN_SETTING="quick"; #buildAll() scan speed. Options: quick, extra, slow, full