From 877b7c9835c1e9ea09002ec5cbbaff156ad4efdd Mon Sep 17 00:00:00 2001
From: David Black <david8black@gmail.com>
Date: Thu, 23 Jan 2014 12:12:37 +0000
Subject: [PATCH] update Superuser

---
 metadata/org.fdroid.superuser.txt             | 19 +++--
 .../org.fdroid.superuser/packageid_1028.patch | 77 +++++++++++++++++++
 2 files changed, 91 insertions(+), 5 deletions(-)
 create mode 100644 metadata/org.fdroid.superuser/packageid_1028.patch

diff --git a/metadata/org.fdroid.superuser.txt b/metadata/org.fdroid.superuser.txt
index 115415e1ba..9e1e41c54e 100644
--- a/metadata/org.fdroid.superuser.txt
+++ b/metadata/org.fdroid.superuser.txt
@@ -16,7 +16,7 @@ the existing su and Superuser app to install itself.
 However, if you know what you are doing you can use this apk
 as a su/Superuser substitute if you are gaining an initial root.
 Once the install is completed you can disable or remove the old app.
-It should work with both ARM and x86.
+It should work with both ARM, x86, MIPS.
 
 We don't provide a flashable zip that could be flashed
 in the event that something goes wrong. Assuming you have a
@@ -63,8 +63,17 @@ sed -i 's/#define REQUESTOR JAVA_PACKAGE_NAME/#define REQUESTOR \
 "org.fdroid.superuser"/g' jni/su/su.h,buildjni=yes
 Build Version:1.0.2.1,1021,!No source for assets/reboot - it's just an unidentified binary that gets executed - https://github.com/koush/Superuser/issues/184
 
-Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:1.0.2.1
-Current Version Code:1021
+Build:1.0.2.8,1028
+    commit=74363eaa79
+    subdir=Superuser
+    srclibs=1:KoushWidgets@2cc45f3
+    patch=packageid_1028.patch
+    prebuild=echo "android.jar=$$SDK$$/platforms/android-19/android.jar" > ant.properties && \
+             sed -i 's/#define REQUESTOR JAVA_PACKAGE_NAME/#define REQUESTOR "org.fdroid.superuser"/g' jni/su/su.h
+    buildjni=yes
+
+Auto Update Mode:None
+Update Check Mode:None
+Current Version:1.0.2.8
+Current Version Code:1028
 
diff --git a/metadata/org.fdroid.superuser/packageid_1028.patch b/metadata/org.fdroid.superuser/packageid_1028.patch
new file mode 100644
index 0000000000..53fdef1e69
--- /dev/null
+++ b/metadata/org.fdroid.superuser/packageid_1028.patch
@@ -0,0 +1,77 @@
+diff --git a/Superuser/build.xml b/Superuser/build.xml
+index d85611b..9355978 100644
+--- a/Superuser/build.xml
++++ b/Superuser/build.xml
+@@ -68,41 +68,6 @@
+     -->
+     <import file="custom_rules.xml" optional="true" />
+ 
+-    <target name="-pre-build">
+-        <exec executable="${ndk.dir}/${ndk.executable}" failonerror="true">
+-          <arg value="-j8" />
+-        </exec>
+-    </target>
+-
+-    <target name="clean" depends="android_rules.clean">
+-        <exec executable="${ndk.dir}/${ndk.executable}" failonerror="true">
+-            <arg value="clean"/>
+-        </exec>
+-        <delete file="bin/update.zip"/>
+-        <delete file="bin/Superuser.apk"/>
+-        <delete dir="bin/META-INF" />
+-    </target>
+-
+-    <target name="-post-build">
+-        <mkdir dir="bin/recoveryzip/META-INF/com/google/android" />
+-        <copy file="assets/update-binary" tofile="bin/recoveryzip/META-INF/com/google/android/update-binary"/>
+-        <copy file="assets/install-recovery.sh" tofile="bin/recoveryzip/install-recovery.sh"/>
+-        <copy file="bin/Superuser-release.apk" tofile="bin/recoveryzip/Superuser.apk"/>
+-
+-        <exec executable="zip" failonerror="true" dir="bin/recoveryzip">
+-          <arg value="-ry"/>
+-          <arg value="../update.zip"/>
+-          <arg value="."/>
+-        </exec>
+-        <exec executable="zip" failonerror="true" dir="libs">
+-          <arg value="-ry"/>
+-          <arg value="../bin/update.zip"/>
+-          <arg value="armeabi"/>
+-          <arg value="x86"/>
+-          <arg value="mips"/>
+-        </exec>
+-    </target>
+-
+     <!-- Import the actual build file.
+ 
+          To customize existing targets, there are two options:
+@@ -123,5 +88,30 @@
+     -->
+     <!-- version-tag: 1 -->
+     <import file="${sdk.dir}/tools/ant/build.xml" />
++    <target name="-package-resources" depends="-crunch">
++	  <do-only-if-not-library elseText="Library project: do not package resources..." >
++              <exec executable="${aapt}" failonerror="true">
++  			<arg value="package" />
++  			<arg value="-f" />
++  			<arg value="-M" />
++  			<arg path="AndroidManifest.xml" />
++			<arg value="-A" />
++			<arg path="${asset.absolute.dir}" />
++ 			<arg value="-F" />
++			<arg path="${out.absolute.dir}/${resource.package.file.name}" />
++ 			<arg value="-I" />
++			<arg path="${android.jar}" />
++  			<arg value="-S" />
++			<arg path="${resource.absolute.dir}" />
++			<arg value="-S" />
++			<arg path="${android.library.reference.1}/res" />
++ 			<arg value="--extra-packages" />
++			<arg value="com.koushikdutta.widgets" />
++  			<arg value="--auto-add-overlay" />
++  			<arg value="--rename-manifest-package" />
++  			<arg value="org.fdroid.superuser" />
++		</exec>
++	  </do-only-if-not-library>
++   </target>
+ 
+ </project>