<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
<html lang="en">
<head>
<meta content="text/html; charset=US-ASCII" http-equiv="Content-Type">
<title>
GitLab
</title>
<style>img {
max-width: 100%; height: auto;
}
</style>
</head>
<body>
<div class="content">
<h3>
Chris Lamb pushed to branch master
at <a href="https://salsa.debian.org/reproducible-builds/diffoscope">Reproducible Builds / diffoscope</a>
</h3>
<h4>
Commits:
</h4>
<ul>
<li>
<strong><a href="https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/f1297ac09c77387568e58c6e8dfb4009a1a7c4cf">f1297ac0</a></strong>
<div>
<span>by Chris Lamb</span>
<i>at 2020-04-13T16:37:27+01:00</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">Dalvik .dex files can also serve as APK containers so restrict the narrower identification of .dex files to files ending with this extension, and widen the identification of APK files to when file(1) discovers a Dalvik file. (Closes: Debian:#884095, reproducible-builds/diffoscope#28)
This is essentially functionally equivalent (yet superior to) always
identifying files named *.apk as APK containers or adding a command-line switch
to "force" identification.
This is not a bug in file(1) as the files do legitimately differ in their
magic numbers:
$ xxd HelloWorld.apk | head -n1
00000000: 504b 0304 0a00 0000 0800 c907 c37d 8dea PK...........}..
$ xxd helloworld-janus.apk | head -n1
00000000: 6465 780a 3033 3500 b5f7 4441 c609 399e dex.035...DA..9.
</pre>
</li>
</ul>
<h4>2 changed files:</h4>
<ul>
<li class="file-stats">
<a href="#3e276271dc7abecfee6ed3e09092cdeaeb36514b">
diffoscope/comparators/apk.py
</a>
</li>
<li class="file-stats">
<a href="#9602c7f81a68aec46dc336ab592487c6d4fb4465">
diffoscope/comparators/dex.py
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id="3e276271dc7abecfee6ed3e09092cdeaeb36514b">
<a href="https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/f1297ac09c77387568e58c6e8dfb4009a1a7c4cf#3e276271dc7abecfee6ed3e09092cdeaeb36514b"><strong>diffoscope/comparators/apk.py</strong></a>
<hr>
<table class="code white" style="font-family: monospace; font-size: 90%;" bgcolor="#fff" width="100%" cellpadding="0" cellspacing="0">
<tr class="line_holder match" id="" style="line-height: 1.6;">
<td class="diff-line-num unfold js-unfold old_line" data-linenumber="188" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td>
<td class="diff-line-num unfold js-unfold new_line" data-linenumber="188" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td>
<td class="line_content match " style="padding-left: 0.5em; padding-right: 0.5em; color: rgba(0,0,0,0.3);" bgcolor="#fafafa">@@ -188,7 +188,7 @@ class ApkContainer(Archive):</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="188" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
188
</td>
<td class="diff-line-num new_line" data-linenumber="188" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
188
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC188" class="line" lang="python"><span class="k" style="font-weight: 600;">class</span> <span class="nc" style="color: #458; font-weight: 600;">ApkFile</span><span class="p">(</span><span class="n" style="color: #333;">File</span><span class="p">):</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="189" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
189
</td>
<td class="diff-line-num new_line" data-linenumber="189" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
189
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC189" class="line" lang="python"> <span class="n" style="color: #333;">DESCRIPTION</span> <span class="o" style="font-weight: 600;">=</span> <span class="s" style="color: #d14;">"Android APK files"</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="190" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
190
</td>
<td class="diff-line-num new_line" data-linenumber="190" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
190
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC190" class="line" lang="python"> <span class="n" style="color: #333;">FILE_TYPE_HEADER_PREFIX</span> <span class="o" style="font-weight: 600;">=</span> <span class="n" style="color: #333;">b</span><span class="s" style="color: #d14;">"PK</span><span class="se" style="color: #d14;">\x03\x04</span><span class="s" style="color: #d14;">"</span></span>
</pre>
</td>
</tr>
<tr class="line_holder old" id="" style="line-height: 1.6;">
<td class="diff-line-num old old_line" data-linenumber="191" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
191
</td>
<td class="diff-line-num new_line old" data-linenumber="191" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content old" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#fbe9eb">
<pre style="margin: 0;">-<span id="LC191" class="line" lang="python"> <span class="n" style="color: #333;">FILE_TYPE_RE</span> <span class="o" style="font-weight: 600;">=</span> <span class="n" style="color: #333;">re</span><span class="o" style="font-weight: 600;">.</span><span class="nb" style="color: #0086b3;">compile</span><span class="p">(</span><span class="s" style="color: #d14;">r'^(<span class="idiff left right">Java|Zip) archive data.*</span>\b'</span><span class="p">)</span></span>
</pre>
</td>
</tr>
<tr class="line_holder new" id="" style="line-height: 1.6;">
<td class="diff-line-num new old_line" data-linenumber="192" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
</td>
<td class="diff-line-num new new_line" data-linenumber="191" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
191
</td>
<td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+<span id="LC191" class="line" lang="python"> <span class="n" style="color: #333;">FILE_TYPE_RE</span> <span class="o" style="font-weight: 600;">=</span> <span class="n" style="color: #333;">re</span><span class="o" style="font-weight: 600;">.</span><span class="nb" style="color: #0086b3;">compile</span><span class="p">(</span><span class="s" style="color: #d14;">r'^(<span class="idiff left right">(Java|Zip) archive data|Dalvik dex file)</span>\b'</span><span class="p">)</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="192" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
192
</td>
<td class="diff-line-num new_line" data-linenumber="192" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
192
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC192" class="line" lang="python"> <span class="n" style="color: #333;">FILE_EXTENSION_SUFFIX</span> <span class="o" style="font-weight: 600;">=</span> <span class="s" style="color: #d14;">'.apk'</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="193" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
193
</td>
<td class="diff-line-num new_line" data-linenumber="193" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
193
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC193" class="line" lang="python"> <span class="n" style="color: #333;">CONTAINER_CLASSES</span> <span class="o" style="font-weight: 600;">=</span> <span class="p">[</span><span class="n" style="color: #333;">ApkContainer</span><span class="p">,</span> <span class="n" style="color: #333;">ZipContainer</span><span class="p">]</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="194" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
194
</td>
<td class="diff-line-num new_line" data-linenumber="194" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
194
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC194" class="line" lang="python"></span>
</pre>
</td>
</tr>
</table>
<br>
</li>
<li id="9602c7f81a68aec46dc336ab592487c6d4fb4465">
<a href="https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/f1297ac09c77387568e58c6e8dfb4009a1a7c4cf#9602c7f81a68aec46dc336ab592487c6d4fb4465"><strong>diffoscope/comparators/dex.py</strong></a>
<hr>
<table class="code white" style="font-family: monospace; font-size: 90%;" bgcolor="#fff" width="100%" cellpadding="0" cellspacing="0">
<tr class="line_holder match" id="" style="line-height: 1.6;">
<td class="diff-line-num unfold js-unfold old_line" data-linenumber="60" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td>
<td class="diff-line-num unfold js-unfold new_line" data-linenumber="60" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td>
<td class="line_content match " style="padding-left: 0.5em; padding-right: 0.5em; color: rgba(0,0,0,0.3);" bgcolor="#fafafa">@@ -60,4 +60,5 @@ class DexContainer(Archive):</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="60" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
60
</td>
<td class="diff-line-num new_line" data-linenumber="60" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
60
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC60" class="line" lang="python"><span class="k" style="font-weight: 600;">class</span> <span class="nc" style="color: #458; font-weight: 600;">DexFile</span><span class="p">(</span><span class="n" style="color: #333;">File</span><span class="p">):</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="61" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
61
</td>
<td class="diff-line-num new_line" data-linenumber="61" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
61
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC61" class="line" lang="python"> <span class="n" style="color: #333;">DESCRIPTION</span> <span class="o" style="font-weight: 600;">=</span> <span class="s" style="color: #d14;">"Dalvik .dex files"</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="62" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
62
</td>
<td class="diff-line-num new_line" data-linenumber="62" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
62
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC62" class="line" lang="python"> <span class="n" style="color: #333;">FILE_TYPE_RE</span> <span class="o" style="font-weight: 600;">=</span> <span class="n" style="color: #333;">re</span><span class="o" style="font-weight: 600;">.</span><span class="nb" style="color: #0086b3;">compile</span><span class="p">(</span><span class="s" style="color: #d14;">r'^Dalvik dex file .*\b'</span><span class="p">)</span></span>
</pre>
</td>
</tr>
<tr class="line_holder new" id="" style="line-height: 1.6;">
<td class="diff-line-num new old_line" data-linenumber="63" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
</td>
<td class="diff-line-num new new_line" data-linenumber="63" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
63
</td>
<td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+<span id="LC63" class="line" lang="python"> <span class="n" style="color: #333;">FILE_EXTENSION_SUFFIX</span> <span class="o" style="font-weight: 600;">=</span> <span class="s" style="color: #d14;">'.dex'</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="63" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
63
</td>
<td class="diff-line-num new_line" data-linenumber="64" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
64
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC64" class="line" lang="python"> <span class="n" style="color: #333;">CONTAINER_CLASSES</span> <span class="o" style="font-weight: 600;">=</span> <span class="p">[</span><span class="n" style="color: #333;">DexContainer</span><span class="p">]</span></span></pre>
</td>
</tr>
</table>
<br>
</li>
</div>
<div class="footer" style="margin-top: 10px;">
<p style="font-size: small; color: #777;">
—
<br>
<a href="https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/f1297ac09c77387568e58c6e8dfb4009a1a7c4cf">View it on GitLab</a>.
<br>
You're receiving this email because of your account on salsa.debian.org.
If you'd like to receive fewer emails, you can
adjust your notification settings.
<script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","action":{"@type":"ViewAction","name":"View Commit","url":"https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/f1297ac09c77387568e58c6e8dfb4009a1a7c4cf"}}</script>
</p>
</div>
</body>
</html>