This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository apktool.
commit 35cf7a015c2621959b0a3692cdb2da3639084139 Merge: eaabb9c 983c08d Author: Markus Koschany <[email protected]> Date: Fri Feb 12 20:31:52 2016 +0100 Imported Debian patch 2.0.2+dfsg-1 .../mindprod/ledatastream/LEDataInputStream.java | 330 --------------------- .../resources/brut/androlib/android-framework.jar | Bin 2288202 -> 0 bytes .../src/main/resources/prebuilt/aapt/linux/aapt | Bin 1967712 -> 0 bytes .../src/main/resources/prebuilt/aapt/macosx/aapt | Bin 2893560 -> 0 bytes .../main/resources/prebuilt/aapt/windows/aapt.exe | Bin 1449984 -> 0 bytes .../apktool/testapp/libs/android-support-v13.jar | Bin 402581 -> 0 bytes debian/apktool.1 | 56 ++++ debian/changelog | 6 +- debian/control | 62 ++-- debian/copyright | 169 ++++++----- debian/gbp.conf | 7 - debian/install | 1 + debian/links | 8 + debian/lintian-overrides | 5 + debian/manpages | 1 + debian/maven.rules | 8 + debian/patches/build.patch | 163 ++++++++++ debian/patches/fix_building.patch | 203 ------------- debian/patches/mindprod-non-military.patch | 63 ++++ debian/patches/series | 3 +- debian/patches/use_system_aapt.patch | 13 +- debian/rules | 22 +- debian/watch | 2 +- debian/wrapper/apktool | 81 +++++ gradle/wrapper/gradle-wrapper.jar | Bin 51348 -> 0 bytes 25 files changed, 537 insertions(+), 666 deletions(-) diff --cc debian/apktool.1 index 0000000,0000000..d64603f new file mode 100644 --- /dev/null +++ b/debian/apktool.1 @@@ -1,0 -1,0 +1,56 @@@ ++.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3. ++.TH APKTOOL "1" "February 2016" "apktool" "User Commands" ++.SH NAME ++apktool \- tool for reverse engineering Android apk files ++.SH DESCRIPTION ++.TP ++usage: apktool ++.TP ++\fB\-advance\fR,\-\-advanced ++prints advance information. ++.TP ++\fB\-version\fR,\-\-version ++prints the version then exits ++.PP ++usage: apktool if|install\-framework [options] <framework.apk> ++.TP ++\fB\-p\fR,\-\-frame\-path <dir> ++Stores framework files into <dir>. ++.TP ++\fB\-t\fR,\-\-tag <tag> ++Tag frameworks using <tag>. ++.PP ++usage: apktool d[ecode] [options] <file_apk> ++.TP ++\fB\-f\fR,\-\-force ++Force delete destination directory. ++.TP ++\fB\-o\fR,\-\-output <dir> ++The name of folder that gets written. Default is apk.out ++.TP ++\fB\-p\fR,\-\-frame\-path <dir> ++Uses framework files located in <dir>. ++.TP ++\fB\-r\fR,\-\-no\-res ++Do not decode resources. ++.TP ++\fB\-s\fR,\-\-no\-src ++Do not decode sources. ++.TP ++\fB\-t\fR,\-\-frame\-tag <tag> ++Uses framework files tagged by <tag>. ++.PP ++usage: apktool b[uild] [options] <app_path> ++.TP ++\fB\-f\fR,\-\-force\-all ++Skip changes detection and build all files. ++.TP ++\fB\-o\fR,\-\-output <dir> ++The name of apk that gets written. Default is dist/name.apk ++.TP ++\fB\-p\fR,\-\-frame\-path <dir> ++Uses framework files located in <dir>. ++.PP ++For additional info, see: http://ibotpeaches.github.io/Apktool/ ++For smali/baksmali info, see: http://code.google.com/p/smali/ ++.PP diff --cc debian/changelog index 75b487d,0000000..cbcb33a mode 100644,000000..100644 --- a/debian/changelog +++ b/debian/changelog @@@ -1,5 -1,0 +1,5 @@@ - apktool (2.0.2-1) unstable; urgency=low ++apktool (2.0.2+dfsg-1) UNRELEASED; urgency=low + - * Initial release (Closes: #nnnnnn) ++ * Initial release (Closes: #806855) + - -- Reiner Herrmann <[email protected]> Tue, 25 Aug 2015 22:30:54 +0200 ++ -- Markus Koschany <[email protected]> Fri, 12 Feb 2016 20:31:52 +0100 diff --cc debian/control index 9279261,0000000..fffa33a mode 100644,000000..100644 --- a/debian/control +++ b/debian/control @@@ -1,30 -1,0 +1,50 @@@ +Source: apktool +Section: devel - Priority: extra ++Priority: optional +Maintainer: Android tools Maintainer <[email protected]> - Uploaders: Reiner Herrmann <[email protected]> - Build-Depends: debhelper (>= 9), - gradle-debian-helper, - antlr3, - jflex, - libantlr3-runtime-java, - libcommons-lang3-java, - libcommons-cli-java, - libcommons-io-java, - libjgit-java, - libguava-java, - libjsr305-java, - libyaml-snake-java, - libxmlunit-java, - libxpp3-java, - proguard - Standards-Version: 3.9.6 ++Uploaders: ++ Markus Koschany <[email protected]> ++Build-Depends: ++ antlr3, ++ debhelper (>= 9), ++ default-jdk, ++ gradle-debian-helper, ++ jflex, ++ libantlr3-runtime-java, ++ libstringtemplate-java, ++ libcommons-cli-java, ++ libcommons-io-java, ++ libcommons-lang3-java, ++ libguava-java, ++ libjgit-java, ++ libjsr305-java, ++ libxmlunit-java, ++ libxpp3-java, ++ libyaml-snake-java, ++ libgradle-jflex-plugin-java, ++ proguard, ++ junit4 ++Standards-Version: 3.9.7 +Homepage: https://ibotpeaches.github.io/Apktool/ +Vcs-Git: https://anonscm.debian.org/git/android-tools/apktool.git +Vcs-Browser: https://anonscm.debian.org/cgit/android-tools/apktool.git + +Package: apktool +Architecture: all - Depends: ${misc:Depends}, aapt - Description: TBD - TODO ++Depends: ++ aapt, ++ libyaml-snake-java, ++ libantlr3-runtime-java, ++ libstringtemplate-java, ++ libguava-java, ++ libcommons-cli-java, ++ libcommons-io-java, ++ libjsr305-java, ++ ${misc:Depends} ++Description: tool for reverse engineering Android apk files ++ A tool for reverse engineering 3rd party, closed, binary Android apps. It can ++ decode resources to nearly original form and rebuild them after making some ++ modifications; it makes possible to debug smali code step by step. Also it ++ makes working with an app easier because of project-like file structure and ++ automation of some repetitive tasks like building apk. ++ diff --cc debian/copyright index 4f2a2ff,0000000..bac200d mode 100644,000000..100644 --- a/debian/copyright +++ b/debian/copyright @@@ -1,194 -1,0 +1,191 @@@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: apktool +Source: https://github.com/iBotPeaches/Apktool - - #Files: * - #Copyright: 2014 Ryszard Wiśniewski <[email protected]> - #License: Apache-2.0 - - Files: brut.apktool/* - brut.j.common/* - brut.j.dir/* - brut.j.util/* - gradle/* - build.gradle - Copyright: 2014 Ryszard Wiśniewski <[email protected]> - License: Apache-2.0 - - Files: brut.apktool/apktool-lib/src/main/java/android/content/res/XmlResourceParser.java - brut.apktool/apktool-lib/src/main/java/android/util/TypedValue.java - Copyright: 2006-2007 The Android Open Source Project - License: Apache-2.0 - - Files: brut.apktool/apktool-lib/src/main/java/android/util/AttributeSet.java - Copyright: 2008 Android4ME - License: Apache-2.0 - - Files: brut.apktool/apktool-lib/src/test/java/brut/androlib/ProviderAttributeTest.java - brut.apktool/apktool-lib/src/test/java/brut/androlib/SharedLibraryTest.java - Copyright: 2014 Ryszard Wiśniewski <[email protected]> - 2014 Connor Tumbleson <[email protected]> - License: Apache-2.0 - - Files: brut.j.util/src/main/java/brut/util/OSDetection.java - Copyright: 2014 Ryszard Wiśniewski <[email protected]> - 2013 Connor Tumbleson <[email protected]> ++Files-Excluded: ++ brut.apktool/apktool-lib/src/main/resources/prebuilt ++ brut.apktool/apktool-lib/src/main/java/com/mindprod/ledatastream/LEDataInputStream.java ++ brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/drawable-ldpi/data.jpg ++ *.jar ++ ++Files: * ++Copyright: 2014, Ryszard Wiśniewski <[email protected]> ++ 2006-2007, The Android Open Source Project ++ 2008, 2008 Android4ME ++ 2014, Connor Tumbleson <[email protected]> +License: Apache-2.0 + +Files: brut.apktool.smali/* - Copyright: 2010 Ben Gruver ++Copyright: 2010, Ben Gruver +License: BSD-3-clause + +Files: brut.apktool.smali/*/build.gradle +Copyright: 2012 Google Inc. - License: BSD-3-clause ++License: BSD-3-clause-Google + +Files: brut.apktool.smali/util/* +Copyright: 2012-2015 Google Inc. - License: BSD-3-clause ++License: BSD-3-clause-Google + +Files: brut.apktool.smali/util/src/main/java/org/jf/util/AlignmentUtils.java + brut.apktool.smali/util/src/main/java/org/jf/util/ClassFileNameHandler.java + brut.apktool.smali/util/src/main/java/org/jf/util/ConsoleUtil.java + brut.apktool.smali/util/src/main/java/org/jf/util/Hex.java + brut.apktool.smali/util/src/main/java/org/jf/util/IndentingWriter.java + brut.apktool.smali/util/src/main/java/org/jf/util/PathUtil.java + brut.apktool.smali/util/src/main/java/org/jf/util/SmaliHelpFormatter.java + brut.apktool.smali/util/src/test/java/org/jf/util/PathUtilTest.java +Copyright: 2010 Ben Gruver +License: BSD-3-clause + - Files: brut.apktool.smali/util/src/main/java/org/jf/util/ExceptionWithContext.java - brut.apktool.smali/util/src/main/java/org/jf/util/Utf8Utils.java - Copyright: 2007 The Android Open Source Project - License: Apache-2.0 - +Files: brut.apktool.smali/smali/src/main/java/org/jf/smali/SmaliMethodParameter.java + brut.apktool.smali/smali/src/main/java/org/jf/smali/SmaliTestUtils.java + brut.apktool.smali/smali/src/main/java/org/jf/smali/WithRegister.java + brut.apktool.smali/smali/src/test/java/ImplicitReferenceTest.java + brut.apktool.smali/dexlib2/* + brut.apktool.smali/baksmali/src/test/java/* +Copyright: 2012-2015 Google Inc. - License: BSD-3-clause ++License: BSD-3-clause-Google + +Files: brut.apktool.smali/smali/src/test/antlr/org/jf/smali/expectedTokensTestGrammar.g +Copyright: 2007-2008 Terence Parr + 2010 Ben Gruver +License: BSD-3-clause + - Files: brut.apktool.smali/smali/src/main/jflex/smaliLexer.jflex - Copyright: ??? - +Files: brut.apktool.smali/baksmali/src/main/* +Copyright: 2010-2011 Ben Gruver +License: BSD-3-clause + +Files: brut.apktool.smali/baksmali/src/test/java/* + brut.apktool.smali/baksmali/src/main/java/org/jf/baksmali/Adaptors/Debug/* + brut.apktool.smali/baksmali/src/main/java/org/jf/baksmali/Adaptors/CommentingIndentingWriter.java + brut.apktool.smali/baksmali/src/main/java/org/jf/baksmali/baksmaliOptions.java +Copyright: 2012-2015 Google Inc. - License: BSD-3-clause - - Files: scripts/linux/apktool - scripts/osx/apktool - Copyright: 2007 The Android Open Source Project - License: Apache-2.0 - - Files: brut.apktool/apktool-lib/src/main/java/com/mindprod/ledatastream/LEDataInputStream.java - Copyright: 1998-2010 Roedy Green, Canadian Mind Products - License: NOMIL ++License: BSD-3-clause-Google + +Files: brut.apktool/apktool-lib/src/main/java/org/xmlpull/mxp1_serializer/MXSerializer.java +Copyright: 2002-2004 Extreme! Lab, Indiana University +License: INDIANA +Comment: copied from XPP (XML Pull Parser): http://www.extreme.indiana.edu/xgws/xsoap/xpp/ + - Files: brut.apktool/apktool-lib/src/main/resources/* - Copyright: ??? - - Files: brut.apktool/apktool-lib/src/test/resources/* - Copyright: ??? - - Files: gradle/wrapper/* - Copyright: ??? - +Files: debian/* - Copyright: 2015 Reiner Herrmann <[email protected]> ++Copyright: 2016, Markus Koschany <[email protected]> +License: Apache-2.0 + +License: Apache-2.0 + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + . + http://www.apache.org/licenses/LICENSE-2.0 + . + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + . + On Debian systems, the complete text of the Apache version 2.0 license + can be found in "/usr/share/common-licenses/Apache-2.0". + - License: BSD-3-clause - This program is free software; you can redistribute it and/or modify - it under the terms of the BSD license. - . - On Debian systems, the complete text of the BSD license in - '/usr/share/common-licenses/BSD'. ++License: BSD-3-clause-Google ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions are ++ * met: ++ * ++ * * Redistributions of source code must retain the above copyright ++ * notice, this list of conditions and the following disclaimer. ++ * * Redistributions in binary form must reproduce the above ++ * copyright notice, this list of conditions and the following disclaimer ++ * in the documentation and/or other materials provided with the ++ * distribution. ++ * * Neither the name of Google Inc. nor the names of its ++ * contributors may be used to endorse or promote products derived from ++ * this software without specific prior written permission. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ++ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT ++ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR ++ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT ++ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, ++ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT ++ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, ++ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ++ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ++ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + - License: NOMIL - This software may be copied and used freely for any purpose but military. - Comment: http://mindprod.com/contact/nonmil.html ++License: BSD-3-clause ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions are ++ * met: ++ * ++ ** Redistributions of source code must retain the above copyright ++ * notice, this list of conditions and the following disclaimer. ++ ** Redistributions in binary form must reproduce the above ++ * copyright notice, this list of conditions and the following disclaimer ++ * in the documentation and/or other materials provided with the ++ * distribution. ++ ** Neither the name of Google Inc. nor the names of its ++ * contributors may be used to endorse or promote products derived from ++ * this software without specific prior written permission. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ++ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT ++ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR ++ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT ++ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, ++ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT ++ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, ++ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ++ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ++ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ */ + +License: INDIANA + Indiana University Extreme! Lab Software License + . + Version 1.1.1 + . + Copyright (c) 2002 Extreme! Lab, Indiana University. All rights reserved. + . - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions ++ Redistribution and use in source and binary forms, with or without ++ modification, are permitted provided that the following conditions + are met: + . - 1. Redistributions of source code must retain the above copyright notice, ++ 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + . - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in ++ 2. Redistributions in binary form must reproduce the above copyright ++ notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the distribution. + . - 3. The end-user documentation included with the redistribution, if any, ++ 3. The end-user documentation included with the redistribution, if any, + must include the following acknowledgment: + . - "This product includes software developed by the Indiana University ++ "This product includes software developed by the Indiana University + Extreme! Lab (http://www.extreme.indiana.edu/)." + . - Alternately, this acknowledgment may appear in the software itself, ++ Alternately, this acknowledgment may appear in the software itself, + if and wherever such third-party acknowledgments normally appear. + . - 4. The names "Indiana Univeristy" and "Indiana Univeristy Extreme! Lab" - must not be used to endorse or promote products derived from this - software without prior written permission. For written permission, ++ 4. The names "Indiana Univeristy" and "Indiana Univeristy Extreme! Lab" ++ must not be used to endorse or promote products derived from this ++ software without prior written permission. For written permission, + please contact http://www.extreme.indiana.edu/. + . - 5. Products derived from this software may not use "Indiana Univeristy" - name nor may "Indiana Univeristy" appear in their name, without prior ++ 5. Products derived from this software may not use "Indiana Univeristy" ++ name nor may "Indiana Univeristy" appear in their name, without prior + written permission of the Indiana University. + . + THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED + WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + IN NO EVENT SHALL THE AUTHORS, COPYRIGHT HOLDERS OR ITS CONTRIBUTORS + BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --cc debian/install index 0000000,0000000..b6068c4 new file mode 100644 --- /dev/null +++ b/debian/install @@@ -1,0 -1,0 +1,1 @@@ ++debian/wrapper/apktool usr/bin diff --cc debian/links index 0000000,0000000..8a46083 new file mode 100644 --- /dev/null +++ b/debian/links @@@ -1,0 -1,0 +1,8 @@@ ++usr/share/java/antlr3-runtime.jar usr/share/apktool/antlr3-runtime.jar ++usr/share/java/stringtemplate.jar usr/share/apktool/stringtemplate.jar ++usr/share/java/commons-cli.jar usr/share/apktool/commons-cli.jar ++usr/share/java/commons-io.jar usr/share/apktool/commons-io.jar ++usr/share/java/guava.jar usr/share/apktool/guava.jar ++usr/share/java/jsr305.jar usr/share/apktool/jsr305.jar ++usr/share/java/snakeyaml.jar usr/share/apktool/snakeyaml.jar ++ diff --cc debian/lintian-overrides index 0000000,0000000..7c94ac9 new file mode 100644 --- /dev/null +++ b/debian/lintian-overrides @@@ -1,0 -1,0 +1,5 @@@ ++# The official release builds a "fatJar" of apktool and these jar files are ++# part of the build process. Since we don't embed different libraries into ++# apktool.jar we have to deal with multiple single jar files. Some of them are ++# codeless but this is not an issue ++codeless-jar diff --cc debian/manpages index 0000000,0000000..ab52add new file mode 100644 --- /dev/null +++ b/debian/manpages @@@ -1,0 -1,0 +1,1 @@@ ++debian/apktool.1 diff --cc debian/maven.rules index 0000000,0000000..04aa6b2 new file mode 100644 --- /dev/null +++ b/debian/maven.rules @@@ -1,0 -1,0 +1,8 @@@ ++ ++junit junit * s/.*/4.x/ * * ++com.google.code.findbugs jsr305 * s/.*/0.x/ * * ++org.yaml snakeyaml * s/.*/1.x/ * * ++org.apache.commons commons-lang3 * s/.*/3.x/ * * ++org.antlr antlr * s/.*/3.x/ * * ++org.antlr antlr-runtime * s/.*/3.x/ * * ++org.antlr stringtemplate * s/.*/3.x/ * * diff --cc debian/patches/build.patch index 0000000,0000000..8f1fe8b new file mode 100644 --- /dev/null +++ b/debian/patches/build.patch @@@ -1,0 -1,0 +1,163 @@@ ++From: Markus Koschany <[email protected]> ++Date: Thu, 11 Feb 2016 18:18:32 +0100 ++Subject: build ++ ++The original upstream distribution of apktool is packaged a so called "fatJar" ++which includes all dependencies in one jar file. The Debian approach is to use ++separate jar files which are simpler to maintain and security vulnerabilites ++can be quickly fixed once. ++ ++Forwarded: not-needed ++--- ++ brut.apktool.smali/baksmali/build.gradle | 22 +++++++++++----------- ++ brut.apktool.smali/smali/build.gradle | 24 ++++++++++++------------ ++ brut.apktool/apktool-cli/build.gradle | 22 +++++++++++----------- ++ build.gradle | 2 +- ++ 4 files changed, 35 insertions(+), 35 deletions(-) ++ ++diff --git a/brut.apktool.smali/baksmali/build.gradle b/brut.apktool.smali/baksmali/build.gradle ++index 0a1ad66..7b10ef4 100644 ++--- a/brut.apktool.smali/baksmali/build.gradle +++++ b/brut.apktool.smali/baksmali/build.gradle ++@@ -52,21 +52,21 @@ processResources.inputs.property('version', version) ++ processResources.expand('version': version) ++ ++ // build a jar containing all dependencies ++-task fatJar (type: Jar) { ++- from sourceSets.main.output ++- from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } } +++//task fatJar (type: Jar) { +++// from sourceSets.main.output +++// from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } } ++ ++- manifest { ++- attributes('Main-Class': 'org.jf.baksmali.main') ++- } ++-} +++// manifest { +++// attributes('Main-Class': 'org.jf.baksmali.main') +++// } +++//} ++ ++-tasks.getByPath('build').dependsOn(fatJar) +++tasks.getByPath('build') ++ ++-task proguard(type: proguard.gradle.ProGuardTask, dependsOn: fatJar) { ++- def outFile = fatJar.destinationDir.getPath() + '/' + fatJar.baseName + '-' + fatJar.version + '-small' + '.' + fatJar.extension +++task proguard(type: proguard.gradle.ProGuardTask) { +++ def outFile = jar.destinationDir.getPath() + '/' + jar.baseName + '-' + jar.version + '-small' + '.' + jar.extension ++ ++- injars fatJar.archivePath +++ injars jar.archivePath ++ outjars outFile ++ ++ libraryjars "${System.properties['java.home']}/lib/rt.jar" ++diff --git a/brut.apktool.smali/smali/build.gradle b/brut.apktool.smali/smali/build.gradle ++index 383660d..4daa908 100644 ++--- a/brut.apktool.smali/smali/build.gradle +++++ b/brut.apktool.smali/smali/build.gradle ++@@ -85,15 +85,15 @@ processResources.inputs.property('version', version) ++ processResources.expand('version': version) ++ ++ // build a jar containing all dependencies ++-task fatJar (type: Jar) { ++- from sourceSets.main.output ++- from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } } +++//task fatJar (type: Jar) { +++// from sourceSets.main.output +++// from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } } ++ ++- manifest { ++- attributes('Main-Class': 'org.jf.smali.main') ++- } ++-} ++-tasks.getByPath('build').dependsOn(fatJar) +++// manifest { +++// attributes('Main-Class': 'org.jf.smali.main') +++// } +++//} +++tasks.getByPath('build') ++ ++ generateTestGrammarSource { ++ outputDirectory = new File(outputDirectory, 'org/jf/smali') ++@@ -107,11 +107,11 @@ generateJFlexSource { ++ outputDirectory = new File(outputDirectory, 'org/jf/smali') ++ } ++ ++-task proguard(type: proguard.gradle.ProGuardTask, dependsOn: fatJar) { ++- def outFile = fatJar.destinationDir.getPath() + '/' + fatJar.baseName + '-' + ++- fatJar.version + '-small' + '.' + fatJar.extension +++task proguard(type: proguard.gradle.ProGuardTask) { +++ def outFile = jar.destinationDir.getPath() + '/' + jar.baseName + '-' + +++ jar.version + '-small' + '.' + jar.extension ++ ++- injars fatJar.archivePath +++ injars jar.archivePath ++ outjars outFile ++ ++ libraryjars "${System.properties['java.home']}/lib/rt.jar" ++diff --git a/brut.apktool/apktool-cli/build.gradle b/brut.apktool/apktool-cli/build.gradle ++index e33e79c..ddb7641 100644 ++--- a/brut.apktool/apktool-cli/build.gradle +++++ b/brut.apktool/apktool-cli/build.gradle ++@@ -13,7 +13,7 @@ ++ * See the License for the specific language governing permissions and ++ * limitations under the License. ++ */ ++-apply plugin: 'eu.appsatori.fatjar' +++//apply plugin: 'eu.appsatori.fatjar' ++ ++ dependencies { ++ compile project(':brut.apktool:apktool-lib') ++@@ -29,22 +29,22 @@ buildscript { ++ } ++ } ++ ++-gradle.taskGraph.whenReady { ++- fatJar { ++- manifest { ++- attributes("Main-Class": "brut.apktool.Main") ++- } ++- } ++-} +++//gradle.taskGraph.whenReady { +++// fatJar { +++// manifest { +++// attributes("Main-Class": "brut.apktool.Main") +++// } +++// } +++//} ++ ++ task cleanOutputDirectory(type: Delete) { ++ delete fileTree(dir: jar.destinationDir.getPath(), exclude: "apktool-cli.jar") ++ } ++ ++-task proguard(type: proguard.gradle.ProGuardTask, dependsOn: fatJar) { +++task proguard(type: proguard.gradle.ProGuardTask) { ++ def outFile = jar.destinationDir.getPath() + '/' + "apktool" + '-' + project.apktool_version + '-small' + '.' + jar.extension ++ ++- injars fatJar.archivePath +++ injars jar.archivePath ++ outjars outFile ++ ++ libraryjars "${System.properties['java.home']}/lib/rt.jar" ++@@ -63,4 +63,4 @@ task proguard(type: proguard.gradle.ProGuardTask, dependsOn: fatJar) { ++ } ++ ++ proguard.dependsOn cleanOutputDirectory ++-tasks.getByPath(':release').dependsOn(proguard) ++\ No newline at end of file +++tasks.getByPath(':release').dependsOn(proguard) ++diff --git a/build.gradle b/build.gradle ++index 1019643..3d8eed2 100644 ++--- a/build.gradle +++++ b/build.gradle ++@@ -77,7 +77,7 @@ buildscript { ++ options.incremental = true ++ } ++ dependencies { ++- classpath 'eu.appsatori:gradle-fatjar-plugin:0.3' +++ //classpath 'eu.appsatori:gradle-fatjar-plugin:0.3' ++ } ++ } ++ diff --cc debian/patches/mindprod-non-military.patch index 0000000,0000000..edeb4ad new file mode 100644 --- /dev/null +++ b/debian/patches/mindprod-non-military.patch @@@ -1,0 -1,0 +1,63 @@@ ++From: Markus Koschany <[email protected]> ++Date: Sat, 13 Feb 2016 16:06:02 +0100 ++Subject: mindprod non military ++ ++Remove non-free mindprod.com code. ++ ++Forwarded: not-needed ++--- ++ .../src/main/java/brut/androlib/res/decoder/ARSCDecoder.java | 4 ++-- ++ .../src/main/java/brut/androlib/res/decoder/AXmlResourceParser.java | 6 +++--- ++ 2 files changed, 5 insertions(+), 5 deletions(-) ++ ++diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ARSCDecoder.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ARSCDecoder.java ++index bb8fbf5..1ee1d77 100644 ++--- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ARSCDecoder.java +++++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ARSCDecoder.java ++@@ -23,7 +23,7 @@ import brut.androlib.res.data.value.*; ++ import brut.util.Duo; ++ import brut.androlib.res.data.ResTable; ++ import brut.util.ExtDataInput; ++-import com.mindprod.ledatastream.LEDataInputStream; +++//import com.mindprod.ledatastream.LEDataInputStream; ++ import java.io.*; ++ import java.math.BigInteger; ++ import java.util.*; ++@@ -61,7 +61,7 @@ public class ARSCDecoder { ++ mCountIn = null; ++ mFlagsOffsets = null; ++ } ++- mIn = new ExtDataInput(new LEDataInputStream(arscStream)); +++ mIn = null; ++ mResTable = resTable; ++ mKeepBroken = keepBroken; ++ } ++diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/AXmlResourceParser.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/AXmlResourceParser.java ++index 1c768a9..5318f52 100644 ++--- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/AXmlResourceParser.java +++++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/AXmlResourceParser.java ++@@ -20,7 +20,7 @@ import android.util.TypedValue; ++ import brut.androlib.AndrolibException; ++ import brut.androlib.res.xml.ResXmlEncoders; ++ import brut.util.ExtDataInput; ++-import com.mindprod.ledatastream.LEDataInputStream; +++//import com.mindprod.ledatastream.LEDataInputStream; ++ import java.io.IOException; ++ import java.io.InputStream; ++ import java.io.Reader; ++@@ -69,7 +69,7 @@ public class AXmlResourceParser implements XmlResourceParser { ++ public void open(InputStream stream) { ++ close(); ++ if (stream != null) { ++- m_reader = new ExtDataInput(new LEDataInputStream(stream)); +++ //m_reader = new ExtDataInput(new LEDataInputStream(stream)); ++ } ++ } ++ ++@@ -994,4 +994,4 @@ public class AXmlResourceParser implements XmlResourceParser { ++ CHUNK_XML_END_NAMESPACE = 0x00100101, ++ CHUNK_XML_START_TAG = 0x00100102, CHUNK_XML_END_TAG = 0x00100103, ++ CHUNK_XML_TEXT = 0x00100104, CHUNK_XML_LAST = 0x00100104; ++-} ++\ No newline at end of file +++} diff --cc debian/patches/series index 21bf065,0000000..7a5c060 mode 100644,000000..100644 --- a/debian/patches/series +++ b/debian/patches/series @@@ -1,2 -1,0 +1,3 @@@ +use_system_aapt.patch - #fix_building.patch ++build.patch ++mindprod-non-military.patch diff --cc debian/patches/use_system_aapt.patch index 22173e4,0000000..ee21dd4 mode 100644,000000..100644 --- a/debian/patches/use_system_aapt.patch +++ b/debian/patches/use_system_aapt.patch @@@ -1,12 -1,0 +1,19 @@@ - Author: Reiner Herrmann <[email protected]> - Description: Use system aapt instead of trying to use included one ++From: Android tools Maintainer <[email protected]> ++Date: Thu, 11 Feb 2016 17:05:52 +0100 ++Subject: use_system_aapt + ++--- ++ brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkOptions.java | 2 +- ++ 1 file changed, 1 insertion(+), 1 deletion(-) ++ ++diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkOptions.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkOptions.java ++index df4774f..23be8d1 100644 +--- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkOptions.java ++++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkOptions.java - @@ -29,5 +29,5 @@ ++@@ -29,5 +29,5 @@ public class ApkOptions { + + public String frameworkFolderLocation = null; + public String frameworkTag = null; +- public String aaptPath = ""; ++ public String aaptPath = "/usr/bin/aapt"; + } diff --cc debian/rules index 2743f86,0000000..7adbaa0 mode 100755,000000..100755 --- a/debian/rules +++ b/debian/rules @@@ -1,16 -1,0 +1,16 @@@ +#!/usr/bin/make -f - - export DH_VERBOSE=1 ++export JAVA_HOME=/usr/lib/jvm/default-java + +%: - dh $@ --buildsystem=gradle ++ dh $@ --parallel --buildsystem=gradle ++ ++override_dh_auto_build: ++ dh_auto_build -- -Dfile.encoding=UTF-8 assemble + ++override_dh_install: ++ mkdir -p debian/apktool/usr/share/apktool ++ find . -name "*.jar" -exec mv {} debian/apktool/usr/share/apktool/ \; ++ dh_install + - # if building without gradle-debian-helper, use: - # - #override_dh_auto_build: - # gradle --offline --refresh-dependencies --stacktrace --no-daemon --gradle-user-home debian/gradle-user-home - # - #override_dh_auto_clean: - # dh_auto_clean - # rm -rf debian/gradle-user-home ++get-orig-source: ++ uscan --force-download --download-current-version --repack --compression xz diff --cc debian/watch index 728b3e8,0000000..238efb1 mode 100644,000000..100644 --- a/debian/watch +++ b/debian/watch @@@ -1,3 -1,0 +1,3 @@@ +version=3 - opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/apktool-$1\.tar\.gz/ \ ++opts=dversionmangle=s/(\da?)[\+\.\-~](?:dfsg|debian|ds|repack|repacked)\.?\d*$/$1/,filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/apktool-$1\.tar\.gz/,repacksuffix=+dfsg \ + https://github.com/iBotPeaches/apktool/tags .*/v?(\d\S*)\.tar\.gz diff --cc debian/wrapper/apktool index 0000000,0000000..ff89eae new file mode 100755 --- /dev/null +++ b/debian/wrapper/apktool @@@ -1,0 -1,0 +1,81 @@@ ++#!/bin/bash ++# ++# Copyright (C) 2007 The Android Open Source Project ++# ++# Licensed under the Apache License, Version 2.0 (the "License"); ++# you may not use this file except in compliance with the License. ++# You may obtain a copy of the License at ++# ++# http://www.apache.org/licenses/LICENSE-2.0 ++# ++# Unless required by applicable law or agreed to in writing, software ++# distributed under the License is distributed on an "AS IS" BASIS, ++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++# See the License for the specific language governing permissions and ++# limitations under the License. ++ ++# This script is a wrapper for smali.jar, so you can simply call "smali", ++# instead of java -jar smali.jar. It is heavily based on the "dx" script ++# from the Android SDK ++ ++# Set up prog to be the path of this script, including following symlinks, ++# and set up progdir to be the fully-qualified pathname of its directory. ++ ++APP_HOME="/usr/share/apktool" ++ ++prog="$0" ++while [ -h "${prog}" ]; do ++ newProg=`/bin/ls -ld "${prog}"` ++ ++ newProg=`expr "${newProg}" : ".* -> \(.*\)$"` ++ if expr "x${newProg}" : 'x/' >/dev/null; then ++ prog="${newProg}" ++ else ++ progdir=`dirname "${prog}"` ++ prog="${progdir}/${newProg}" ++ fi ++done ++oldwd=`pwd` ++progdir=`dirname "${prog}"` ++cd "${progdir}" ++progdir="/usr/share/apktool" ++prog="${progdir}"/`basename "${prog}"` ++cd "${oldwd}" ++ ++jarfile="apktool-2.0.2+dfsg.jar" ++libdir="/usr/share/apktool" ++if [ ! -r "$libdir/$jarfile" ] ++then ++ echo `basename "$prog"`": can't find $jarfile" ++ exit 1 ++fi ++ ++javaOpts="" ++ ++# If you want DX to have more memory when executing, uncomment the following ++# line and adjust the value accordingly. Use "java -X" for a list of options ++# you can pass here. ++w ++# ++javaOpts="-Xmx512M -Dfile.encoding=utf-8" ++ ++# Alternatively, this will extract any parameter "-Jxxx" from the command line ++# and pass them to Java (instead of to dx). This makes it possible for you to ++# add a command-line parameter such as "-JXmx256M" in your ant scripts, for ++# example. ++while expr "x$1" : 'x-J' >/dev/null; do ++ opt=`expr "$1" : '-J\(.*\)'` ++ javaOpts="${javaOpts} -${opt}" ++ shift ++done ++ ++if [ "$OSTYPE" = "cygwin" ] ; then ++ jarpath=`cygpath -w "$libdir/$jarfile"` ++else ++ jarpath="$libdir/$jarfile" ++fi ++ ++# add current location to path for aapt ++PATH=$PATH:`pwd`; ++export PATH; ++exec java $javaOpts -cp "/usr/share/apktool/*" brut.apktool.Main "$@" -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/apktool.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
