diffstat for apktool-2.7.0+dfsg apktool-2.7.0+dfsg changelog | 7 +++++++ patches/snakeyaml2.patch | 11 ++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff -Nru apktool-2.7.0+dfsg/debian/changelog apktool-2.7.0+dfsg/debian/changelog --- apktool-2.7.0+dfsg/debian/changelog 2025-12-01 17:07:48.000000000 +0200 +++ apktool-2.7.0+dfsg/debian/changelog 2026-04-25 12:05:51.000000000 +0300 @@ -1,3 +1,10 @@ +apktool (2.7.0+dfsg-7.2) unstable; urgency=low + + * Non-maintainer upload. + * Further snakeyaml 2.x fixes from Vladimir Petko. (Closes: #1128802) + + -- Adrian Bunk Sat, 25 Apr 2026 12:05:51 +0300 + apktool (2.7.0+dfsg-7.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru apktool-2.7.0+dfsg/debian/patches/snakeyaml2.patch apktool-2.7.0+dfsg/debian/patches/snakeyaml2.patch --- apktool-2.7.0+dfsg/debian/patches/snakeyaml2.patch 2025-12-01 17:07:40.000000000 +0200 +++ apktool-2.7.0+dfsg/debian/patches/snakeyaml2.patch 2026-04-25 12:05:49.000000000 +0300 @@ -14,7 +14,7 @@ import org.yaml.snakeyaml.constructor.AbstractConstruct; import org.yaml.snakeyaml.constructor.Constructor; import org.yaml.snakeyaml.error.YAMLException; -@@ -29,6 +30,7 @@ +@@ -29,12 +30,16 @@ protected final List> allowableClasses = new ArrayList<>(); public ClassSafeConstructor() { @@ -22,6 +22,15 @@ this.yamlConstructors.put(Tag.STR, new ConstructStringEx()); this.allowableClasses.add(MetaInfo.class); + this.allowableClasses.add(PackageInfo.class); + this.allowableClasses.add(UsesFramework.class); + this.allowableClasses.add(VersionInfo.class); ++ loadingConfig.setTagInspector( tag -> ++ this.allowableClasses.stream().map( x -> x.getName() ) ++ .anyMatch( x -> x.equals(tag.getClassName()))); + } + + protected Object newInstance(Node node) { --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/meta/EscapedStringRepresenter.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/meta/EscapedStringRepresenter.java @@ -16,11 +16,13 @@