From ba903e4c52a646cbea648d0b48180d8f7aa33b85 Mon Sep 17 00:00:00 2001 From: David Black Date: Sat, 13 Apr 2013 13:15:27 +0100 Subject: [PATCH] tidy up com.googlecode.networklog --- metadata/com.googlecode.networklog.txt | 58 +++++++++++++++----------- metadata/org.kost.externalip.txt | 4 +- 2 files changed, 37 insertions(+), 25 deletions(-) diff --git a/metadata/com.googlecode.networklog.txt b/metadata/com.googlecode.networklog.txt index d2ff5175f9..ed3cc74901 100644 --- a/metadata/com.googlecode.networklog.txt +++ b/metadata/com.googlecode.networklog.txt @@ -28,30 +28,6 @@ Build Version:2.8.1,20801,2.8.1,update=.;ActionBarSherlock/library;ViewPagerIndi Build Version:2.8.2,20802,2.8.2,update=.;ActionBarSherlock/library;ViewPagerIndicator/library Build Version:2.8.3,20803,2.8.3,update=.;ActionBarSherlock/library;ViewPagerIndicator/library Build Version:2.8.4,20804,2.8.4,update=.;ActionBarSherlock/library;ViewPagerIndicator/library -#Building grep and iptables from source -Build Version:2.8.5,20805,!dummy version. ndk-build works; fdroid stops 5ca210ed8e9c,\ -extlibs=android/android-support-v4.jar,\ -update=.;ActionBarSherlock/library;ViewPagerIndicator/library,\ -prebuild=$$NDK$$/ndk-build && \ -mv libs/armeabi/grep libs/armeabi/grep_armv5 && \ -zip res/raw/grep_armv5.zip libs/armeabi/grep_armv5 && \ -mv libs/armeabi-v7a/grep libs/armeabi-v7a/grep_armv7 && \ -zip res/raw/grep_armv7.zip libs/armeabi/grep_armv7 && \ -mv libs/mips/grep libs/mips/grep_mips && \ -zip res/raw/grep_mips.zip libs/armeabi/grep_mips && \ -mv libs/x86/grep libs/x86/grep_x86 && \ -zip res/raw/grep_x86.zip libs/armeabi/grep_x86 && \ -mv libs/armeabi/iptables libs/armeabi/iptables_armv5 && \ -zip res/raw/iptables_armv5.zip libs/armeabi/iptables_armv5 && \ -mv libs/armeabi-v7a/iptables libs/armeabi-v7a/iptables_armv7 && \ -zip res/raw/iptables_armv7.zip libs/armeabi/iptables_armv7 && \ -mv libs/mips/iptables libs/mips/iptables_mips && \ -zip res/raw/iptables_mips.zip libs/armeabi/iptables_mips && \ -mv libs/x86/iptables libs/x86/iptables_x86 && \ -zip res/raw/iptables_x86.zip libs/armeabi/iptables_x86 && \ -rm -rf libs/armeabi libs/armeabi-v7a libs/mips libs/x86,buildjni=no -Build Version:2.9.0,20900,2.9.0,extlibs=android/android-support-v4.jar,\ -update=.;ActionBarSherlock/library;ViewPagerIndicator/library,buildjni=no Build Version:2.10.0,21000,2.10.0,buildjni=no,update=.;ActionBarSherlock/library;ViewPagerIndicator/library,rm=libs/android-support-v4.jar Build Version:2.11.0,21100,2.11.0,buildjni=no,rm=libs/android-support-v4.jar,update=.;ActionBarSherlock/library;ViewPagerIndicator/library Build Version:2.12.0,21200,2.12.0,buildjni=no,update=.;ActionBarSherlock/library;ViewPagerIndicator/library,rm=libs/android-support-v4.jar @@ -67,3 +43,37 @@ Update Check Mode:Tags Current Version:2.17.0 Current Version Code:21700 +# Using alternative iptables source still leads to fdroid errors for non-armeabi +Build Version:x,x,!fdroid errors; ndk-build works fine (at x),\ +update=.;ActionBarSherlock/library;ViewPagerIndicator/library,prebuild=\ +rm libs/android*.jar && cd jni && rm -rf iptables && \ +wget https://hg.adblockplus.org/adblockplusandroid/raw-file/d7c96f2212b1/iptables.patch && \ +git clone https://android.googlesource.com/platform/external/iptables && \ +cd iptables && git apply ../iptables.patch && \ +make fixextensions,build=$$NDK$$/ndk-build && \ +mv libs/armeabi/grep libs/armeabi/grep_armv5 && \ +zip res/raw/grep_armv5.zip libs/armeabi/grep_armv5 && \ +mv libs/armeabi/nflog libs/armeabi/nflog_armv5 && \ +zip res/raw/nflog_armv5.zip libs/armeabi/nflog_armv5 && \ +mv libs/armeabi/iptables libs/armeabi/iptables_armv5 && \ +zip res/raw/iptables_armv5.zip libs/armeabi/iptables_armv5 && \ +mv libs/armeabi-v7a/grep libs/armeabi-v7a/grep_armv7 && \ +zip res/raw/grep_armv7.zip libs/armeabi/grep_armv7 && \ +mv libs/armeabi-v7a/iptables libs/armeabi-v7a/iptables_armv7 && \ +zip res/raw/iptables_armv7.zip libs/armeabi/iptables_armv7 && \ +mv libs/armeabi-v7a/nflog libs/armeabi-v7a/nflog_armv7 && \ +zip res/raw/nflog_armv7.zip libs/armeabi/nflog_armv7 && \ +mv libs/mips/grep libs/mips/grep_mips && \ +zip res/raw/grep_mips.zip libs/armeabi/grep_mips && \ +mv libs/mips/iptables libs/mips/iptables_mips && \ +zip res/raw/iptables_mips.zip libs/armeabi/iptables_mips && \ +mv libs/mips/nflog libs/mips/nflog_mips && \ +zip res/raw/nflog_mips.zip libs/armeabi/nflog_mips && \ +mv libs/x86/grep libs/x86/grep_x86 && \ +zip res/raw/grep_x86.zip libs/armeabi/grep_x86 && \ +mv libs/x86/iptables libs/x86/iptables_x86 && \ +zip res/raw/iptables_x86.zip libs/armeabi/iptables_x86 && \ +mv libs/x86/nflog libs/x86/nflog_x86 && \ +zip res/raw/nflog_x86.zip libs/armeabi/nflog_x86 && \ +rm -rf libs/armeabi libs/armeabi-v7a libs/mips libs/x86,buildjni=no + diff --git a/metadata/org.kost.externalip.txt b/metadata/org.kost.externalip.txt index 79d3b2fd5b..1796ac289a 100644 --- a/metadata/org.kost.externalip.txt +++ b/metadata/org.kost.externalip.txt @@ -6,7 +6,9 @@ Issue Tracker:https://code.google.com/p/external-ip/issues/list Summary:Display your IP addresses Description: -Simple application to display IP addresses in form that you can copy & paste. +Simple application to display IP addresses. Copy/paste might not work +on all versions of Android. Only the latest version works. There +are a couple of html tags in the output. . Repo Type:hg