From a69153c83fafae70d07125925b8266ffceec9ae9 Mon Sep 17 00:00:00 2001
From: David Black <david8black@gmail.com>
Date: Fri, 24 Jan 2014 16:39:49 +0000
Subject: [PATCH] Disable Busybox Installer, prior to adding a different
 package...

The author suggested to publish the "free" version as it will get
updated more frequently: he holds back source code for the pro
version for a time. I'm in favour of this, not least because it
removes the potentially troublesome backup/restore functionality.
---
 metadata/stericson.busybox.donate.txt | 61 +--------------------------
 1 file changed, 2 insertions(+), 59 deletions(-)

diff --git a/metadata/stericson.busybox.donate.txt b/metadata/stericson.busybox.donate.txt
index 2ca9e9f044..88a3dfd900 100644
--- a/metadata/stericson.busybox.donate.txt
+++ b/metadata/stericson.busybox.donate.txt
@@ -1,3 +1,4 @@
+Disabled:Publish stericson.busybox instead: it's more limited but safer (since it doesn't have the restore option) and likely to get updated more often. The source code for this version is held back for a time (for financial gain, no doubt).
 Categories:System
 License:Apache2
 Web Site:http://code.google.com/p/busybox-android
@@ -71,66 +72,8 @@ Build:10.3.1,162
            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 
 
-Build:10.7,180
-    commit=37
-    subdir=application/Busybox
-    disable=busybox builds but java app isn't functional; if building for multiple architectures, need to rename busybox binaries sensibly so they are made available in the UI
-    forceversion=yes
-    forcevercode=yes
-    gradle=pro
-    srclibs=RootTools@3.4;BusyboxConfigs-linusyang@63dc
-    prebuild=mkdir assets && \
-        cp -r $$RootTools$$/src/com/stericson/RootTools src/main/java/stericson/ && \
-        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 ../Busybox/assets/busybox.png 
-
-Build:10.7,200
-    commit=37
-    disable=using Tias repo:sed: invalid option -- 'D' -- 'z' after patching; if building for multiple architectures, 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 r40.
-
-Busybox x86 and MIPS don't build for me with linusyang setup with stericson and basic configs.
-The Tias setup won't patch properly; maybe it's my version of sed.
-
-Recommended toolchain is 4.4.3, but f-droid doesn't have that.
-
-For 10.3 I just ripped out the prebuilts; it seems to be OK but somebody should verify.
-This is all I had to go on: https://f-droid.org/forums/topic/busybox-installer/page/2/#post-10075,
-but the source code is so messed up and the blobs are still there :\
-
-Could consider use of standalone toolchains for compatibility with older NDKs:
-https://github.com/cernekee/openconnect/commit/9df6672d7c80ceef2ed41
-.
-
 Auto Update Mode:None
 Update Check Mode:None
-Current Version:10.3
+Current Version:10.3.1
 Current Version Code:162