Merge commit 'refs/merge-requests/333' of gitorious.org:f-droid/fdroiddata

metadata/com.android.inputmethod.latin.txt

@@ -18,10 +18,9 @@ in the repository but they'd need to be compiled.
 
 Of course, you can't install this if you have a ROM that already has 
 the com.android.inputmethod.latin package installed.
-You could build it yourself with a different package name, but on Android 4.3
+You could build it yourself with a different package name, but you might need
-it still couldn't be installed as a user app, unless the original allowed
+to change the authority string for dictionary packs too; this may be fixed in the next builds.
-the dictionary provider to be exported, which is unlikely.
+Otherwise, you'll have to remove the original from /system/app (and dalvik-cache)
-So, you'd have to remove the original from /system/app (and dalvik-cache)
 via root, before installing this.
 .
 
@@ -76,12 +75,9 @@ Maintainer Notes:
 Note that, like other AOSP apps, there are now special tags with 'sdk' in them; 
 not sure what the difference is.
 
-Possible tweaks:
+Todo for next versions:
-  Could compile with dictionary provider exported to allow access from other apps, but 
+  Change authority string in res/values/dictionary-pack.xml,  à la  
-of course it's only relevant if installing other similar packages ''after'' this; see,
+    android:authorities="@string/authority" to allow for installation on top of other apps.
-https://developer.android.com/guide/topics/manifest/provider-element.html
-             sed -i 's/exported="false"/exported="true"/g' AndroidManifest.xml && \
-
   Split up packages based on user dictionaries.
 .
 

metadata/org.adblockplus.android.txt

@@ -45,7 +45,7 @@ Build:1.0.1,168
     commit=1.0.1
     init=rm -rf iptables/ libs/RootTools-1.7.jar build.xml && \
         git clone https://android.googlesource.com/platform/external/iptables
-    srclibs=RootTools@211
+    srclibs=RootTools@1.7
     prebuild=echo "source.dir=src;$$RootTools$$/src" >> ant.properties && \
         cd iptables && \
         git apply ../iptables.patch && \
@@ -59,7 +59,7 @@ Build:1.1,238
     init=rm -rf bin/ gen/ iptables/ libs/* obj/ build.xml && \
         git clone https://android.googlesource.com/platform/external/iptables
     update=.;submodules/actionbarsherlock/library;submodules/android-switch-backport
-    srclibs=RootTools@211
+    srclibs=RootTools@1.7
     prebuild=echo "source.dir=src;$$RootTools$$/src" >> ant.properties && \
         cd iptables && \
         git apply ../iptables.patch && \
@@ -73,7 +73,7 @@ Build:1.1.1,248
     init=rm -rf bin/ gen/ iptables/ libs/* obj/ build.xml && \
         git clone https://android.googlesource.com/platform/external/iptables
     update=.;submodules/actionbarsherlock/library;submodules/android-switch-backport
-    srclibs=RootTools@211
+    srclibs=RootTools@1.7
     prebuild=echo "source.dir=src;$$RootTools$$/src" >> ant.properties && \
         cd iptables && \
         git apply ../iptables.patch && \
@@ -84,7 +84,7 @@ Build:1.1.1,248
 
 Build:1.1.2,253
     commit=1.1.2
-    srclibs=RootTools@211;iptables@android-4.2.2_r1
+    srclibs=RootTools@1.7;iptables@android-4.2.2_r1
     prebuild=rm libs/RootTools-1.7.jar && \
         cp -r $$iptables$$ . && \
         echo "source.dir=src;$$RootTools$$/src" >> ant.properties && \
@@ -98,7 +98,7 @@ Build:1.1.2,253
 
 Build:1.1.3,270
     commit=1.1.3
-    srclibs=RootTools@211;iptables@android-4.2.2_r1
+    srclibs=RootTools@1.7;iptables@android-4.2.2_r1
     prebuild=rm libs/RootTools-1.7.jar && \
         cp -r $$iptables$$ . && \
         echo "source.dir=src;$$RootTools$$/src" >> ant.properties && \
@@ -112,7 +112,7 @@ Build:1.1.3,270
 
 Build:1.1.4,286
     commit=1.1.4
-    srclibs=RootTools@211;iptables@android-4.2.2_r1
+    srclibs=RootTools@1.7;iptables@android-4.2.2_r1
     prebuild=rm libs/RootTools-1.7.jar && \
         cp -r $$iptables$$ . && \
         echo "source.dir=src;$$RootTools$$/src" >> ant.properties && \

metadata/stericson.busybox.donate.txt

@@ -4,55 +4,109 @@ Web Site:http://code.google.com/p/busybox-android/
 Source Code:http://code.google.com/p/busybox-android/source
 Issue Tracker:http://code.google.com/p/busybox-android/issues
 
-Summary:BusyBox installer
+Name:BusyBox Installer
+Summary:Interface to install system tools
 Description:
-Installs and updates BusyBox on a rooted device.
+Interface to install BusyBox 1.21.1 
+(just ARM architecture for now as the other ones can't be built) 
+as well other versions off the internet (if you're brave).
+Don't install the 1.21.0 version as it isn't in the apk.
 
 BusyBox combines tiny versions of many common UNIX utilities into a single
 small executable. It provides replacements for most of the utilities you
-usually find in GNU fileutils, shellutils, etc. See the BusyBox web site at
+usually find in GNU fileutils, shellutils, etc. 
-http://www.busybox.net for more information. BusyBox itself is GPLv2
+Android usually comes with a very limited multi-tool called Toolbox
-licensed.
+and sometimes it is crippled even more, so a standard Busybox is often needed
+by root apps that need to do different jobs.
+
+The app allows you backup and restore current binaries; to disable individual applets 
+and see their help documentation.
+Just in case something goes wrong it would be wise to have a system
+image nearby that can be flashed via recovery or fastboot.
+
+The range of applets in
+[https://raw2.github.com/tias/android-busybox-ndk/master/android_ndk_stericson-like this]
+version isn't identical to the upstream version.
+
+Requires root.
 .
 
 Requires Root:Yes
 
 Repo Type:git-svn
-Repo:http://busybox-android.googlecode.com/svn;trunk=trunk;tags=tags
+Repo:http://busybox-android.googlecode.com/svn/trunk
 
-Build Version:7.1,103,!busybox prebuilt binaries 3,target=android-8,prebuild=\
+Build:10.3,161
-cd src/stericson &&\
+    commit=32
-svn co -r 133 http://roottools.googlecode.com/svn/trunk/Developmental/RootTools_sdk3_generic/src/com/stericson/RootTools &&\
+    subdir=app/Pro
-cd ../..
+    target=android-15
+    srclibs=1:ViewPagerIndicator@8cd549;RootTools@3.4;BusyboxConfigs-linusyang@63dc
+    rm=binaries;patches;app/Free;app/Pro/assets
+    prebuild=mkdir assets && \
+        cp -r $$RootTools$$/src/com/ src/ && \
+        cp -r $$BusyboxConfigs-linusyang$$ ../BB && \
+        sed -i 's/darwin-x86_64/linux-x86/g;/android_ndk_config-w-patches/d;s/#CONFIG_FILE/CONFIG_FILE/' ../BB/Makefile
+     build=cd ../BB && \
+           export PATH=$$NDK$$/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin:$PATH && \
+           make CONFIG_SYSROOT="$$NDK$$/platforms/android-9/arch-arm" ARCH=arm ANDROID_NDK=$$NDK$$ && \
+           mv busybox-git.arm/busybox ../Pro/assets/busybox1.21.1.png 
 
-# Replace reboot.png etc. in assets: although they are pulled from a device
+Build:10.7,180
-# and don't need to be built from source according to system library exception,
+    commit=37
-# we could pull them from Replicant or CM.
+    subdir=application/Busybox
-# x86 and MIPS builds don't work for some reason
+    disable=busybox builds but java app isn't functional; need to rename busybox binaries sensibly so they are made available in the UI
-Build Version:9.6.3,141,!WIP (see description) at 26,subdir=app,\
+    forceversion=yes
-patch=code-141.patch,\
+    forcevercode=yes
-target=android-15,\
+    gradle=pro
-srclibs=ViewPagerIndicator@2.2.3;Busybox@1_21_0;RootTools@211;BusyboxConfigs@e71bc43bd0,\
+    srclibs=RootTools@3.4;BusyboxConfigs-linusyang@63dc
-prebuild=sed -i 's@\(.1=\).*@\1$$ViewPagerIndicator$$@' project.properties && \
+    prebuild=mkdir assets && \
-         rm -f ../binaries/* assets/busybox* && mkdir -p libs/ && \
+        cp -r $$RootTools$$/src/com/stericson/RootTools src/main/java/stericson/ && \
-         cp -r $$RootTools$$ .. && cp -r $$Busybox$$ .. && \
+        cp -r $$BusyboxConfigs-linusyang$$ ../BB && \
-         cp -r $$BusyboxConfigs$$/* ../Busybox/configs/ && \
+        sed -i 's/darwin-x86_64/linux-x86/g;/android_ndk_config-w-patches/d;s/#CONFIG_FILE/CONFIG_FILE/' ../BB/Makefile
-         cd ../Busybox && for i in configs/patches/*.patch; do patch -p1 < $i; done && \
+    build=cd ../BB && \
-         mv configs/android_ndk_stericson-like .config,\
+        export PATH=$$NDK$$/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin:$PATH && \
-build=cd ../RootTools && ant release && ant -f makejar.ant && \
+        make CONFIG_SYSROOT="$$NDK$$/platforms/android-9/arch-arm" ARCH=arm ANDROID_NDK=$$NDK$$ && \
-      mv roottools.jar ../app/libs/ && ant clean && cd ../Busybox && \
+        mv busybox-git.arm/busybox ../Busybox/assets/busybox.png 
-      export PATH=$$NDK$$/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin:$PATH && \
+
-      make CONFIG_SYSROOT="$$NDK$$/platforms/android-9/arch-arm" ARCH=arm ANDROID_NDK=$$NDK$$ && \
+Build:10.7,200
-      mv busybox ../app/assets/busybox-1.21.0-ARM.png && make clean 
+    commit=37
+    disable=using Tias repo:sed: invalid option -- 'D' -- 'z' after patching; need to rename busybox binaries sensibly so they are made available in the UI
+    forceversion=yes
+    forcevercode=yes
+    subdir=application/Busybox
+    gradle=pro
+    srclibs=RootTools@3.4;BusyboxConfigs@835af1
+    prebuild=mkdir assets && \
+        cp -r $$RootTools$$/src/com/stericson/RootTools src/main/java/stericson/ && \
+        cp -r $$BusyboxConfigs$$ ../BB && \
+        sed -i 's/i686-android-linux/i686-linux-android/g;/android_ndk_config-w-patches/d;s/#CONFIG_FILE/CONFIG_FILE/' ../BB/Makefile
+    build=cd ../BB && \
+        export PATH=$$NDK$$/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin:$PATH && \
+        make CONFIG_SYSROOT="$$NDK$$/platforms/android-9/arch-arm" ARCH=arm ANDROID_NDK=$$NDK$$ && \
+        mv busybox-git.arm/busybox ../Busybox/assets/busybox-1.21.0-ARM.png && \
+        export PATH=$$NDK$$/toolchains/x86-4.4.3/prebuilt/linux-x86/bin:$PATH && \
+        make CONFIG_SYSROOT="$$NDK$$/platforms/android-9/arch-x86" ARCH=x86 ANDROID_NDK=$$NDK$$ && \
+        mv busybox-git.x86/busybox ../Busybox/assets/busybox-1.21.0-x86.png && \
+        export PATH=$$NDK$$/toolchains/mipsel-linux-android-4.4.3/prebuilt/linux-x86/bin:$PATH && \
+        make CONFIG_SYSROOT="$$NDK$$/platforms/android-9/arch-mips" ARCH=mips ANDROID_NDK=$$NDK$$ && \
+        mv busybox-git.mips/busybox ../Busybox/assets/busybox-1.21.0-MIPS.png
+
+Maintainer Notes:
+The Java app is hard to figure out as things keep moving around and there are 
+no commit descriptions.
+It's now using gradle but it's half baked at time of writing.
+
+Busybox x86 and MIPS hang for me with linusyang setup with stericson and basic configs.
+The Tias setup won't patch properly; maybe it's my version of sed.
+
+The busybox binary was tested with toolchain 4.6; I don't have toolchain 4.4.3 installed.
+So if it doesn't build just sed 4.6 in ../BB/Makefile.
+
+For 10.3 I just ripped out the prebuilts; it seems to be OK but somebody should verify.
+.
 
-#export PATH=$$NDK$$/toolchains/mipsel-linux-android-4.4.3/prebuilt/linux-x86/bin:$PATH && \
-#export PATH=$$NDK$$/toolchains/x86-4.4.3/prebuilt/linux-x86/bin:$PATH && \
-#make CONFIG_SYSROOT="$$NDK$$/platforms/android-9/arch-x86" ARCH=x86 ANDROID_NDK=$$NDK$$ && \
-#mv busybox ../app/assets/busybox-1.21.0-x86.png && make clean
-#make CONFIG_SYSROOT="$$NDK$$/platforms/android-9/arch-mips" ARCH=mips ANDROID_NDK=$$NDK$$ && \
-#mv busybox ../app/assets/busybox-1.21.0-MIPS.png && make clean 
 Auto Update Mode:None
-Update Check Mode:Static
+Update Check Mode:None
-Current Version:9.6.3
+Current Version:10.3
-Current Version Code:141
+Current Version Code:161
 

metadata/stericson.busybox.donate/code-141.patch

@@ -1,20 +0,0 @@
-diff --git a/app/src/stericson/busybox/donate/Constants.java b/app/src/stericson/busybox/donate/Constants.java
-index 8c16ce7..573c64b 100644
---- a/app/src/stericson/busybox/donate/Constants.java
-+++ b/app/src/stericson/busybox/donate/Constants.java
-@@ -23,12 +23,12 @@ public class Constants {
- 							EXTRA_INSTALL_PATH = "path",
- 							PREF_NAME = "BusyBox";
- 	
--	public static String	newest = "BusyBox 1.20.2";
-+	public static String	newest = "BusyBox 1.21.0-ARM";
- 	public static String 	Key = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk78EBO78KPQkOCo2SCPqImOv6ViRmY7Vy/d5xOi1+B1mJEWtHreHxrDw9sdyVaxbd3X/PnFIUQzj2Qk159RMP7p2lIiJ1yYVyifOciVV1f4r2z7llCKMJYCVVe0k+9P5SVEWZWoV+5QqJqm06pZ12ChsMNUN+3JujIUtiCARVn4wBmCT+eXfHcxmhyVfnE4a+3FlLGYrnCKE2B6AhcHXJXfPaW3K4P6JMDbWGoxO6yM/qPHqsfbsZK45Ooaqs1To2Oe6b7SaaAxAXPGipTCzQ7x8BRnMLkTMoLVDN0ABVlCgYpcWB9HysPALIXstSUWeGnF4WptkAfc34sQZm42DsQIDAQAB";
- 	
--	public static String[] versions = { "BusyBox 1.20.2", "BusyBox 1.20.1", "Custom Version..."};
-+	public static String[] versions = { "BusyBox 1.21.0-ARM", "BusyBox 1.21.0-ARM", "Custom Version..."};
- 	
- 	public static String[] locations = { "/system/bin", "/system/xbin", "Custom Path" };
- 
--	public static String[] appletsString = new String("[, [[, acpid, addgroup, adduser, adjtimex, ar, arp, arping, ash, awk, basename, beep, blkid, brctl, bunzip2, bzcat, bzip2, cal, cat, catv, chat, chattr, chgrp, chmod, chown, chpasswd, chpst, chroot, chrt, chvt, cksum, clear, cmp, comm, cp, cpio, crond, crontab, cryptpw, cut, date, dc, dd, deallocvt, delgroup, deluser, depmod, devmem, df, dhcprelay, diff, dirname, dmesg, dnsd, dnsdomainname, dos2unix, dpkg, du, dumpkmap, dumpleases, echo, ed, egrep, eject, env, envdir, envuidgid, expand, expr, fakeidentd, false, fbset, fbsplash, fdflush, fdformat, fdisk, fgrep, find, findfs, flash_lock, flash_unlock, fold, free, freeramdisk, fsck, fsck.minix, fsync, ftpd, ftpget, ftpput, fuser, getopt, getty, grep, gunzip, gzip, hd, hdparm, head, hexdump, hostid, hostname, httpd, hush, hwclock, id, ifconfig, ifdown, ifenslave, ifplugd, ifup, inetd, init, inotifyd, insmod, install, ionice, ip, ipaddr, ipcalc, ipcrm, ipcs, iplink, iproute, iprule, iptunnel, kbd_mode, kill, killall, killall5, klogd, last, length, less, linux32, linux64, linuxrc, ln, loadfont, loadkmap, logger, login, logname, logread, losetup, lpd, lpq, lpr, ls, lsattr, lsmod, lzmacat, lzop, lzopcat, makemime, man, md5sum, mdev, mesg, microcom, mkdir, mkdosfs, mkfifo, mkfs.minix, mkfs.vfat, mknod, mkpasswd, mkswap, mktemp, modprobe, more, mount, mountpoint, mt, mv, nameif, nc, netstat, nice, nmeter, nohup, nslookup, od, openvt, passwd, patch, pgrep, pidof, ping, ping6, pipe_progress, pivot_root, pkill, popmaildir, printenv, printf, ps, pscan, pwd, raidautorun, rdate, rdev, readlink, readprofile, realpath, reformime, renice, reset, resize, rm, rmdir, rmmod, route, rpm, rpm2cpio, rtcwake, run-parts, runlevel, runsv, runsvdir, rx, script, scriptreplay, sed, sendmail, seq, setarch, setconsole, setfont, setkeycodes, setlogcons, setsid, setuidgid, sha1sum, sha256sum, sha512sum, showkey, slattach, sleep, softlimit, sort, split, start-stop-daemon, stat, strings, stty, sulogin, sum, sv, svlogd, swapoff, swapon, switch_root, sync, sysctl, syslogd, tac, tail, tar, taskset, tcpsvd, tee, telnet, telnetd, test, tftp, tftpd, time, timeout, top, touch, tr, traceroute, true, tty, ttysize, udhcpc, udhcpd, udpsvd, umount, uname, uncompress, unexpand, uniq, unix2dos, unlzma, unlzop, unzip, uptime, usleep, uudecode, uuencode, vconfig, vi, vlock, volname, watch, watchdog, wc, wget, which, who, whoami, xargs, yes, zcat, zcip").replace(" ", "").split(",");
-+	public static String[] appletsString = new String("[, [[, ar, ash, awk, base64, basename, bbconfig, beep, blkid, brctl, bunzip2, bzcat, bzip2, cal, cat, chat, chattr, chgrp, chmod, chown, chroot, chrt, cksum, clear, cmp, comm, cp, cpio, crond, crontab, cut, date, dd, depmod, devmem, df, diff, dirname, dmesg, dnsd, dnsdomainname, dos2unix, du, echo, ed, egrep, env, expand, expr, fakeidentd, false, fdflush, fdformat, fdisk, fgrep, find, findfs, fold, free, freeramdisk, fsck, fsync, ftpd, ftpget, ftpput, fuser, getopt, grep, groups, gunzip, gzip, hd, hdparm, head, hexdump, hostname, httpd, hwclock, id, ifconfig, inetd, inotifyd, insmod, install, ionice, iostat, ip, ipaddr, ipcalc, iplink, iproute, iprule, iptunnel, kill, killall, killall5, less, ln, losetup, ls, lsattr, lsmod, lspci, lsusb, lzcat, lzma, lzop, lzopcat, man, md5sum, mesg, microcom, mkdir, mkdosfs, mke2fs, mkfifo, mkfs.ext2, mkfs.vfat, mknod, mkswap, mktemp, modinfo, modprobe, more, mount, mountpoint, mv, nanddump, nandwrite, nc, netstat, nice, nmeter, nohup, nslookup, od, patch, pgrep, pidof, ping, pkill, pmap, powertop, printenv, printf, ps, pscan, pstree, pwd, pwdx, rdate, rdev, readlink, realpath, renice, reset, resize, rm, rmdir, rmmod, route, run-parts, script, scriptreplay, sed, seq, setconsole, setkeycodes, setlogcons, setserial, setsid, setuidgid, sh, sha1sum, sha256sum, sha512sum, showkey, slattach, sleep, smemcap, sort, split, stat, strings, stty, sum, swapoff, swapon, sync, sysctl, tac, tail, tar, tee, telnet, telnetd, test, tftp, tftpd, time, timeout, top, touch, tr, traceroute, true, tty, ttysize, tunctl, tune2fs, umount, uname, uncompress, unexpand, uniq, unix2dos, unlzma, unlzop, unxz, unzip, uptime, usleep, uudecode, uuencode, vconfig, vi, watch, wc, wget, which, whoami, whois, xargs, xz, xzcat, yes, zcat, zcip").replace(" ", "").split(",");
- }

srclibs/BusyboxConfigs-linusyang.txt

@@ -0,0 +1,3 @@
+Repo Type:git
+Repo:https://github.com/linusyang/android-busybox-ndk.git
+

srclibs/RootTools.txt

@@ -1,7 +1,6 @@
-Repo Type:svn
+Repo Type:git-svn
-Repo:http://roottools.googlecode.com/svn/trunk/Stable/RootTools-sdk3-generic
+Repo:http://roottools.googlecode.com/svn;trunk=trunk/Stable/RootTools-sdk3-generic;tags=trunk/Stable/TAGS
 
-Prepare:echo -e "android.library=true\ntarget=android-16\n" >> project.properties
+#Prepare:mkdir -p bin/classes && echo -e "android.library=true\ntarget=android-16\n" >> project.properties
-
+#Update Project:Yes
-Update Project:Yes