diff --git a/metadata/dev.ukanth.ufirewall.txt b/metadata/dev.ukanth.ufirewall.txt index 1480d6f8f1..ea51378f2b 100644 --- a/metadata/dev.ukanth.ufirewall.txt +++ b/metadata/dev.ukanth.ufirewall.txt @@ -1,23 +1,24 @@ Category:Internet License:GPLv3 -Web Site:https://github.com/ukanth/afwall/ +Web Site:https://github.com/ukanth/afwall/wiki Source Code:https://github.com/ukanth/afwall Issue Tracker:https://github.com/ukanth/afwall/issues Summary:Control network traffic Description: -N.B. Due to an oversight, this app was included even though it includes some -elements -that are not built from source i.e. busybox and iptables binaries. The build -is left in, with the hope that a fully FOSS build can be provided soon, since -the source -exists in the Droidwall repo. - -Firewall (IPtables frontend), forked from DroidWall. -See [https://github.com/ukanth/afwall/blob/master/Changelog.md changelog] for -news. - +Firewall (iptables frontend), based on DroidWall which is no longer being +developed. +* Supports ICS/JB 4.2.2 +* Import/Export Rules to external storage +* Search Applications +* Multiple profiles with custom names +* Highlights system applications with custom color +* Notify on new installations +* VPN Support +* Device Admin support to protect against being uninstalled Requires root: Yes. iptables must run as root. + +[https://github.com/ukanth/afwall/blob/master/Changelog.md Changelog] . Requires Root:Yes @@ -25,11 +26,25 @@ Requires Root:Yes Repo Type:git Repo:https://github.com/ukanth/afwall.git -Build Version:1.0.3a,103,!need to build iptables a52574f283,srclibs=ActionBarSherlock@4.1.0,prebuild=\ -sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties +Build Version:1.2.0,120,!wait on merge request 1.2.0,\ +srclibs=ActionBarSherlock@4.2.0;LockPattern@1c1307;Busybox@83785f0;\ +iptables@android-4.2.2_r1,extlibs=android/android-support-v4.jar,prebuild=\ +rm -rf res/raw/busybox_g1 res/raw/iptables_armv5 external/ && \ +mv libs/android-support-v4.jar $$ActionBarSherlock$$/libs/ && \ +sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \ +sed -i 's@\(android.library.reference.2=\).*@\1$$LockPattern$$@' project.properties && \ +export PATH=$$NDK$$/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin:$PATH && \ +mkdir -p bb/ && cp -r $$Busybox$$/* bb/ && cd bb/ && \ +wget https://raw.github.com/tias/android-busybox-ndk/bd2bf4f384350a2bb2f81444012a882ddd48662a/android_ndk_defconfigPlus && \ +mv android_ndk_defconfigPlus .config && \ +make CONFIG_SYSROOT="$$NDK$$/platforms/android-9/arch-arm" && mv busybox ../res/raw/busybox_g1 && \ +cd ../ && git clone https://android.googlesource.com/platform/external/iptables && cd iptables && \ +wget https://hg.adblockplus.org/adblockplusandroid/raw-file/c3c62b79e758/iptables.patch -P ../ && \ +git apply ../iptables.patch && sed -i 's@ndk-build@$$NDK$$/ndk-build@g' Makefile && \ +make all && mv libs/armeabi/iptables ../res/raw/iptables_armv5 Auto Update Mode:None -Update Check Mode:None -Current Version:@string/app_version -Current Version Code:103 +Update Check Mode:Tags +Current Version:1.2.0 +Current Version Code:120 diff --git a/metadata/org.adblockplus.android.txt b/metadata/org.adblockplus.android.txt index ad9ce67250..e49733c2be 100644 --- a/metadata/org.adblockplus.android.txt +++ b/metadata/org.adblockplus.android.txt @@ -10,15 +10,14 @@ Description: Adblock Plus runs in the background and filters ads, using the same filters as the Adblock Plus browser extension. It may need [https://adblockplus.org/en/android-config manual configuration] -if you don't have proxy settings available on the phone. +if you don't have proxy settings available on the phone. If you are using +Android 4.2.2 you will also need to go manual. Requires root: No. It uses a local proxy to filter ads '''if you have Android -3+''', but if you allow root the app can edit the hosts file too. +3+''', but if you allow root the app can edit the hosts file too. The proxy +does use require quite a bit of RAM but the root method does not. . -#sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \ -#sed -i 's@\(android.library.reference.2=\).*@\1$$SwitchBackport$$@' project.properties && \ -#SwitchBackport@7cd19d1a41c4;ActionBarSherlock@4.2.0;Iptables@android-4.2.2_r1 Repo Type:hg Repo:https://hg.adblockplus.org/adblockplusandroid