From 5150c721f4500a52bc7d27e6344e5936bffffd24 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Wed, 12 Mar 2025 17:03:13 +0100
Subject: [PATCH 1/8] verify_apk_signature: work when options is not set

Then test_signatures.py can run on the PUBLISH CI job.
---
 .gitlab-ci.yml         | 1 +
 fdroidserver/common.py | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2e48c0bb..42833779 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -739,6 +739,7 @@ PUBLISH:
         tests/test_gpgsign.py
         tests/test_metadata.py
         tests/test_publish.py
+        tests/test_signatures.py
         tests/test_signindex.py
 
     - cd tests
diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 96b75944..f473efd7 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -3894,11 +3894,11 @@ def verify_apk_signature(apk, min_sdk_version=None):
         args = [config['apksigner'], 'verify']
         if min_sdk_version:
             args += ['--min-sdk-version=' + min_sdk_version]
-        if options.verbose:
+        if options and options.verbose:
             args += ['--verbose']
         try:
             output = subprocess.check_output(args + [apk])
-            if options.verbose:
+            if options and options.verbose:
                 logging.debug(apk + ': ' + output.decode('utf-8'))
             return True
         except subprocess.CalledProcessError as e:

From 68fad5c7f70f0dc3687002794801eafa0d69c66c Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Fri, 14 Mar 2025 11:33:48 +0100
Subject: [PATCH 2/8] gitlab-ci: delete extraneous keystore key from PUBLISH
 job

repo_keyalias is set in tests/config.yml, so this does not need to fake the
fdroiddata value.
---
 .gitlab-ci.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 42833779..a176097f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -760,9 +760,6 @@ PUBLISH:
     # silence warnings
     - chmod 0600 config.yml config/*.yml config/*/*.yml
     - chmod 0700 $gpghome
-    # make fake 'ciarang' index signing key
-    - keytool -keyclone -alias 4e7da5b7 -dest ciarang
-        -keypass:env keypass -new:env keypass -storepass:env keystorepass -keystore $keystore
 
     - export PATH=$CI_PROJECT_DIR:$PATH
 

From 8f351d8406743295c61fa1d8954226b5835098b6 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Wed, 19 Mar 2025 21:33:39 +0100
Subject: [PATCH 3/8] publish: convert to black code format

---
 fdroidserver/publish.py | 27 ++++++++++++-----------
 pyproject.toml          |  2 --
 tests/test_publish.py   | 48 ++++++++++++++++++++++++++++-------------
 3 files changed, 48 insertions(+), 29 deletions(-)

diff --git a/fdroidserver/publish.py b/fdroidserver/publish.py
index 1cd8538a..42eb0f6f 100644
--- a/fdroidserver/publish.py
+++ b/fdroidserver/publish.py
@@ -347,7 +347,6 @@ def main():
         glob.glob(os.path.join(unsigned_dir, '*.apk'))
         + glob.glob(os.path.join(unsigned_dir, '*.zip'))
     ):
-
         appid, vercode = common.publishednameinfo(apkfile)
         apkfilename = os.path.basename(apkfile)
         if vercodes and appid not in vercodes:
@@ -371,7 +370,6 @@ def main():
             if b.get("versionCode") == vercode:
                 build = b
         if app.Binaries or (build and build.binary):
-
             # It's an app where we build from source, and verify the apk
             # contents against a developer's binary, and then publish their
             # version if everything checks out.
@@ -382,15 +380,21 @@ def main():
             srcapk = srcapk.replace(unsigned_dir, binaries_dir)
 
             if not os.path.isfile(srcapk):
-                logging.error("...reference binary missing - publish skipped: "
-                              "'{refpath}'".format(refpath=srcapk))
+                logging.error(
+                    "...reference binary missing - publish skipped: '{refpath}'".format(
+                        refpath=srcapk
+                    )
+                )
                 failed += 1
             else:
                 # Compare our unsigned one with the downloaded one...
                 compare_result = common.verify_apks(srcapk, apkfile, tmp_dir)
                 if compare_result:
-                    logging.error("...verification failed - publish skipped : "
-                                  "{result}".format(result=compare_result))
+                    logging.error(
+                        "...verification failed - publish skipped : {result}".format(
+                            result=compare_result
+                        )
+                    )
                     failed += 1
                 else:
                     # Success! So move the downloaded file to the repo, and remove
@@ -402,7 +406,6 @@ def main():
                     logging.info('Published ' + apkfilename)
 
         elif apkfile.endswith('.zip'):
-
             # OTA ZIPs built by fdroid do not need to be signed by jarsigner,
             # just to be moved into place in the repo
             shutil.move(apkfile, os.path.join(output_dir, apkfilename))
@@ -410,7 +413,6 @@ def main():
             logging.info('Published ' + apkfilename)
 
         else:
-
             # It's a 'normal' app, i.e. we sign and publish it...
             skipsigning = False
 
@@ -449,10 +451,11 @@ def main():
 
                 signed_apk_path = os.path.join(output_dir, apkfilename)
                 if os.path.exists(signed_apk_path):
-                    raise BuildException("Refusing to sign '{0}' file exists in both "
-                                         "{1} and {2} folder.".format(apkfilename,
-                                                                      unsigned_dir,
-                                                                      output_dir))
+                    raise BuildException(
+                        _(
+                            "Refusing to sign '{path}' file exists in both {dir1} and {dir2} folder."
+                        ).format(path=apkfilename, dir1=unsigned_dir, dir2=output_dir)
+                    )
 
                 # Sign the application...
                 common.sign_apk(apkfile, signed_apk_path, keyalias)
diff --git a/pyproject.toml b/pyproject.toml
index a643fa37..53c4b60d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -40,7 +40,6 @@ force-exclude = '''(
   | fdroidserver/index\.py
   | fdroidserver/metadata\.py
   | fdroidserver/nightly\.py
-  | fdroidserver/publish\.py
   | fdroidserver/update\.py
   | fdroidserver/vmtools\.py
   | locale/pick-complete-translations\.py
@@ -50,7 +49,6 @@ force-exclude = '''(
   | tests/openssl-version-check-test\.py
   | tests/valid-package-names/test\.py
   | tests/test_common\.py
-  | tests/test_publish\.py
   | tests/test_signatures\.py
   | tests/test_update\.py
 )$'''
diff --git a/tests/test_publish.py b/tests/test_publish.py
index 46167be7..cb47bff5 100755
--- a/tests/test_publish.py
+++ b/tests/test_publish.py
@@ -131,7 +131,7 @@ class PublishTest(unittest.TestCase):
         publish.config['keypass'] = '123456'
         publish.config['keystore'] = os.path.join(basedir, 'dummy-keystore.jks')
         publish.config['repo_keyalias'] = 'repokey'
-        publish.config['repo_key_sha256'] = 'bad bad bad bad bad bad bad bad bad bad bad bad'
+        publish.config['repo_key_sha256'] = 'bad bad bad bad bad bad bad bad bad bad'
 
         os.chdir(self.testdir)
         publish.store_publish_signer_fingerprints({}, indent=2)
@@ -154,10 +154,16 @@ class PublishTest(unittest.TestCase):
         with open(os.path.join(metadata_dir, 'com.politedroid.yml'), 'a') as fp:
             fp.write('\nBinaries: https://placeholder/foo%v.apk\n')
         os.mkdir(os.path.join(self.testdir, 'unsigned'))
-        shutil.copy('repo/com.politedroid_6.apk', os.path.join(self.testdir, 'unsigned'))
+        shutil.copy(
+            'repo/com.politedroid_6.apk', os.path.join(self.testdir, 'unsigned')
+        )
         os.mkdir(os.path.join(self.testdir, 'unsigned', 'binaries'))
-        shutil.copy('repo/com.politedroid_6.apk',
-                    os.path.join(self.testdir, 'unsigned', 'binaries', 'com.politedroid_6.binary.apk'))
+        shutil.copy(
+            'repo/com.politedroid_6.apk',
+            os.path.join(
+                self.testdir, 'unsigned', 'binaries', 'com.politedroid_6.binary.apk'
+            ),
+        )
 
         os.chdir(self.testdir)
         with mock.patch.object(sys, 'argv', ['fdroid fakesubcommand']):
@@ -201,7 +207,9 @@ class PublishTest(unittest.TestCase):
         publish.config['keystorepass'] = '123456'
         publish.config['keypass'] = '654321'
         publish.config['keystore'] = "keystore.jks"
-        publish.config['keydname'] = 'CN=Birdman, OU=Cell, O=Alcatraz, L=Alcatraz, S=California, C=US'
+        publish.config[
+            'keydname'
+        ] = 'CN=Birdman, OU=Cell, O=Alcatraz, L=Alcatraz, S=CA, C=US'
         os.chdir(self.testdir)
         keystore = jks.KeyStore.new("jks", [])
         keystore.save(publish.config['keystore'], publish.config['keystorepass'])
@@ -211,7 +219,9 @@ class PublishTest(unittest.TestCase):
         self.assertFalse(publish.create_key_if_not_existing("newalias"))
         self.assertTrue(publish.create_key_if_not_existing("anotheralias"))
 
-        keystore = jks.KeyStore.load(publish.config['keystore'], publish.config['keystorepass'])
+        keystore = jks.KeyStore.load(
+            publish.config['keystore'], publish.config['keystorepass']
+        )
         self.assertCountEqual(keystore.private_keys, ["newalias", "anotheralias"])
         for alias, pk in keystore.private_keys.items():
             self.assertFalse(pk.is_decrypted())
@@ -236,7 +246,9 @@ class PublishTest(unittest.TestCase):
                 publish.status_update_json([], [])
                 with open('repo/status/publish.json') as fp:
                     data = json.load(fp)
-                self.assertEqual(shutil.which(publish.config['apksigner']), data['apksigner'])
+                self.assertEqual(
+                    shutil.which(publish.config['apksigner']), data['apksigner']
+                )
 
                 publish.config = {}
                 common.fill_config_defaults(publish.config)
@@ -254,13 +266,15 @@ class PublishTest(unittest.TestCase):
         common.options = VerboseFalseOptions
         config = common.read_config()
         if 'apksigner' not in config:
-            self.skipTest('SKIPPING test_sign_then_implant_signature, apksigner not installed!')
+            self.skipTest(
+                'SKIPPING test_sign_then_implant_signature, apksigner not installed!'
+            )
         config['repo_keyalias'] = 'sova'
         config['keystorepass'] = 'r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI='
         config['keypass'] = 'r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI='
         shutil.copy(basedir / 'keystore.jks', self.testdir)
         config['keystore'] = 'keystore.jks'
-        config['keydname'] = 'CN=Birdman, OU=Cell, O=Alcatraz, L=Alcatraz, S=California, C=US'
+        config['keydname'] = 'CN=Birdman, OU=Cell, O=Alcatraz, L=Alcatraz, S=CA, C=US'
         publish.config = config
         common.config = config
 
@@ -286,7 +300,9 @@ class PublishTest(unittest.TestCase):
         # sign the unsigned APK
         self.assertTrue(os.path.exists(unsigned))
         self.assertFalse(os.path.exists(signed))
-        with mock.patch('sys.argv', ['fdroid publish', '%s:%d' % (app.id, versionCode)]):
+        with mock.patch(
+            'sys.argv', ['fdroid publish', '%s:%d' % (app.id, versionCode)]
+        ):
             publish.main()
         self.assertFalse(os.path.exists(unsigned))
         self.assertTrue(os.path.exists(signed))
@@ -295,7 +311,9 @@ class PublishTest(unittest.TestCase):
             signatures.main()
         self.assertTrue(
             os.path.exists(
-                os.path.join('metadata', 'org.fdroid.ci', 'signatures', '1', 'MANIFEST.MF')
+                os.path.join(
+                    'metadata', 'org.fdroid.ci', 'signatures', '1', 'MANIFEST.MF'
+                )
             )
         )
         os.remove(signed)
@@ -304,7 +322,9 @@ class PublishTest(unittest.TestCase):
         shutil.copy(testapk, unsigned)
         self.assertTrue(os.path.exists(unsigned))
         self.assertFalse(os.path.exists(signed))
-        with mock.patch('sys.argv', ['fdroid publish', '%s:%d' % (app.id, versionCode)]):
+        with mock.patch(
+            'sys.argv', ['fdroid publish', '%s:%d' % (app.id, versionCode)]
+        ):
             publish.main()
         self.assertFalse(os.path.exists(unsigned))
         self.assertTrue(os.path.exists(signed))
@@ -336,9 +356,7 @@ class PublishTest(unittest.TestCase):
         config['keypass'] = 'r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI='
         shutil.copy(basedir / 'keystore.jks', self.testdir)
         config['keystore'] = 'keystore.jks'
-        config[
-            'keydname'
-        ] = 'CN=Birdman, OU=Cell, O=Alcatraz, L=Alcatraz, S=California, C=US'
+        config['keydname'] = 'CN=Birdman, OU=Cell, O=Alcatraz, L=Alcatraz, S=CA, C=US'
         publish.config = config
         common.config = config
 

From d024c8964f717a9818149021bea194315c451fdb Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Wed, 12 Mar 2025 16:55:12 +0100
Subject: [PATCH 4/8] convert test_signatures.py to black code format

---
 pyproject.toml           |  1 -
 tests/test_signatures.py | 33 +++++++++++++++++++++++----------
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 53c4b60d..34fbe3b2 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -49,7 +49,6 @@ force-exclude = '''(
   | tests/openssl-version-check-test\.py
   | tests/valid-package-names/test\.py
   | tests/test_common\.py
-  | tests/test_signatures\.py
   | tests/test_update\.py
 )$'''
 
diff --git a/tests/test_signatures.py b/tests/test_signatures.py
index 5a9393b2..94725942 100755
--- a/tests/test_signatures.py
+++ b/tests/test_signatures.py
@@ -22,7 +22,6 @@ class SignaturesTest(unittest.TestCase):
 
     @unittest.skipIf(sys.byteorder == 'big', "androguard is not ported to big-endian")
     def test_main(self):
-
         class OptionsFixture:
             APK = [os.path.join(basedir, 'repo', 'com.politedroid_3.apk')]
 
@@ -30,17 +29,31 @@ class SignaturesTest(unittest.TestCase):
             signatures.extract(OptionsFixture)
 
             # check if extracted signatures are where they are supposed to be
-            # also verify weather if extracted file contian what they should
+            # also verify weather if extracted file contain what they should
             filesAndHashes = (
-                (os.path.join('metadata', 'com.politedroid', 'signatures', '3', 'MANIFEST.MF'),
-                 '7dcd83f0c41a75457fd2311bf3c4578f80d684362d74ba8dc52838d353f31cf2'),
-                (os.path.join('metadata', 'com.politedroid', 'signatures', '3', 'RELEASE.RSA'),
-                 '883ef3d5a6e0bf69d2a58d9e255a7930f08a49abc38e216ed054943c99c8fdb4'),
-                (os.path.join('metadata', 'com.politedroid', 'signatures', '3', 'RELEASE.SF'),
-                 '99fbb3211ef5d7c1253f3a7ad4836eadc9905103ce6a75916c40de2831958284'),
+                (
+                    os.path.join(
+                        'metadata', 'com.politedroid', 'signatures', '3', 'MANIFEST.MF'
+                    ),
+                    '7dcd83f0c41a75457fd2311bf3c4578f80d684362d74ba8dc52838d353f31cf2',
+                ),
+                (
+                    os.path.join(
+                        'metadata', 'com.politedroid', 'signatures', '3', 'RELEASE.RSA'
+                    ),
+                    '883ef3d5a6e0bf69d2a58d9e255a7930f08a49abc38e216ed054943c99c8fdb4',
+                ),
+                (
+                    os.path.join(
+                        'metadata', 'com.politedroid', 'signatures', '3', 'RELEASE.SF'
+                    ),
+                    '99fbb3211ef5d7c1253f3a7ad4836eadc9905103ce6a75916c40de2831958284',
+                ),
             )
             for path, checksum in filesAndHashes:
-                self.assertTrue(os.path.isfile(path),
-                                f'check whether {path!r} was extracted correctly.')
+                self.assertTrue(
+                    os.path.isfile(path),
+                    f'check whether {path!r} was extracted correctly.',
+                )
                 with open(path, 'rb') as f:
                     self.assertEqual(hashlib.sha256(f.read()).hexdigest(), checksum)

From eef3188600b4b745293061012b8389a2f8aa2cf0 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Wed, 12 Mar 2025 17:05:38 +0100
Subject: [PATCH 5/8] test_signatures: remove unneeded config from tests

---
 tests/test_signatures.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/test_signatures.py b/tests/test_signatures.py
index 94725942..603ddf2c 100755
--- a/tests/test_signatures.py
+++ b/tests/test_signatures.py
@@ -17,7 +17,6 @@ class SignaturesTest(unittest.TestCase):
         common.config = None
         config = common.read_config()
         config['jarsigner'] = common.find_sdk_tools_cmd('jarsigner')
-        config['verbose'] = True
         common.config = config
 
     @unittest.skipIf(sys.byteorder == 'big', "androguard is not ported to big-endian")

From 40be283c4a8f04621e2096149a1c7ddf2d049a1a Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Mon, 17 Feb 2025 16:22:55 +0100
Subject: [PATCH 6/8] APK for testing maxSdkVersion handling

APK is org.bitbucket.tickytacky.mirrormirror_4.apk disassembled with
`apktool decode`, maxSdkVersion added, then reassembled with `apktool build`
---
 MANIFEST.in                          |   2 +
 tests/metadata/org.maxsdkversion.yml |   2 +
 tests/repo/entry.json                |   6 +--
 tests/repo/index-v1.json             |  36 ++++++++++++++++++
 tests/repo/index-v2.json             |  55 +++++++++++++++++++++++++++
 tests/repo/index.xml                 |  29 ++++++++++++++
 tests/repo/org.maxsdkversion_4.apk   | Bin 0 -> 12768 bytes
 tests/test_update.py                 |   6 +--
 8 files changed, 130 insertions(+), 6 deletions(-)
 create mode 100644 tests/metadata/org.maxsdkversion.yml
 create mode 100644 tests/repo/org.maxsdkversion_4.apk

diff --git a/MANIFEST.in b/MANIFEST.in
index 0dac052c..cd5ed76a 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -637,6 +637,7 @@ include tests/metadata/obb.main.twoversions.yml
 include tests/metadata/org.adaway.yml
 include tests/metadata/org.fdroid.ci.test.app.yml
 include tests/metadata/org.fdroid.fdroid.yml
+include tests/metadata/org.maxsdkversion.yml
 include tests/metadata/org.smssecure.smssecure/signatures/134/28969C09.RSA
 include tests/metadata/org.smssecure.smssecure/signatures/134/28969C09.SF
 include tests/metadata/org.smssecure.smssecure/signatures/134/MANIFEST.MF
@@ -689,6 +690,7 @@ include tests/repo/obb.main.twoversions_1101613.apk
 include tests/repo/obb.main.twoversions_1101615.apk
 include tests/repo/obb.main.twoversions_1101617.apk
 include tests/repo/obb.main.twoversions_1101617_src.tar.gz
+include tests/repo/org.maxsdkversion_4.apk
 include tests/repo/org.videolan.vlc/en-US/icon.png
 include tests/repo/org.videolan.vlc/en-US/phoneScreenshots/screenshot10.png
 include tests/repo/org.videolan.vlc/en-US/phoneScreenshots/screenshot12.png
diff --git a/tests/metadata/org.maxsdkversion.yml b/tests/metadata/org.maxsdkversion.yml
new file mode 100644
index 00000000..08eab4db
--- /dev/null
+++ b/tests/metadata/org.maxsdkversion.yml
@@ -0,0 +1,2 @@
+Name: maxSdkVersion
+Summary: Test setting maxSdkVersion in an APK
diff --git a/tests/repo/entry.json b/tests/repo/entry.json
index c52f31ba..1eb017bc 100644
--- a/tests/repo/entry.json
+++ b/tests/repo/entry.json
@@ -3,9 +3,9 @@
   "version": 20002,
   "index": {
     "name": "/index-v2.json",
-    "sha256": "bef31251dd4bdfc34f9a9e7b93dbf3e0bc7172e17d1d72a550c10d1bc183c01c",
-    "size": 53527,
-    "numPackages": 10
+    "sha256": "f0912b64db80168ee807f43ab3470bb709b6659aee05ad63057dcbcd1c97dc5e",
+    "size": 55186,
+    "numPackages": 11
   },
   "diffs": {}
 }
\ No newline at end of file
diff --git a/tests/repo/index-v1.json b/tests/repo/index-v1.json
index ec2195b4..ed1cbcde 100644
--- a/tests/repo/index-v1.json
+++ b/tests/repo/index-v1.json
@@ -91,6 +91,16 @@
         }
       }
     },
+    {
+      "suggestedVersionCode": "4",
+      "license": "Unknown",
+      "name": "maxSdkVersion",
+      "summary": "Test setting maxSdkVersion in an APK",
+      "added": 1739805810000,
+      "icon": "org.maxsdkversion.4.png",
+      "packageName": "org.maxsdkversion",
+      "lastUpdated": 1739805810000
+    },
     {
       "categories": [
         "Development"
@@ -652,6 +662,32 @@
         "versionName": "0.1"
       }
     ],
+    "org.maxsdkversion": [
+      {
+        "added": 1739805810000,
+        "apkName": "org.maxsdkversion_4.apk",
+        "features": [
+          "android.hardware.camera.front"
+        ],
+        "hash": "877d582369d2840fc0d6892e44feaaad21419b0e35af42f22b3e127bcd08274d",
+        "hashType": "sha256",
+        "maxSdkVersion": 25,
+        "minSdkVersion": 14,
+        "packageName": "org.maxsdkversion",
+        "sig": "1a5e67bcef6b2d6242f2d36982b54589",
+        "signer": "401a3a5843a3d5cebc22e6de5cb76d08eaa6797122d7fe1283df1d192e132f5e",
+        "size": 12768,
+        "targetSdkVersion": 19,
+        "uses-permission": [
+          [
+            "android.permission.CAMERA",
+            null
+          ]
+        ],
+        "versionCode": 4,
+        "versionName": "1.0.3"
+      }
+    ],
     "souch.smsbypass": [
       {
         "added": 1524700800000,
diff --git a/tests/repo/index-v2.json b/tests/repo/index-v2.json
index ecb0fdc0..96c2cfea 100644
--- a/tests/repo/index-v2.json
+++ b/tests/repo/index-v2.json
@@ -1381,6 +1381,61 @@
         }
       }
     },
+    "org.maxsdkversion": {
+      "metadata": {
+        "added": 1739805810000,
+        "lastUpdated": 1739805810000,
+        "name": {
+          "en-US": "maxSdkVersion"
+        },
+        "summary": {
+          "en-US": "Test setting maxSdkVersion in an APK"
+        },
+        "icon": {
+          "en-US": {
+            "name": "/icons/org.maxsdkversion.4.png",
+            "sha256": "428442a0b75be04af3191a066041341f8a0b289972f99868687f43e02055a348",
+            "size": 91
+          }
+        },
+        "preferredSigner": "401a3a5843a3d5cebc22e6de5cb76d08eaa6797122d7fe1283df1d192e132f5e"
+      },
+      "versions": {
+        "877d582369d2840fc0d6892e44feaaad21419b0e35af42f22b3e127bcd08274d": {
+          "added": 1739805810000,
+          "file": {
+            "name": "/org.maxsdkversion_4.apk",
+            "sha256": "877d582369d2840fc0d6892e44feaaad21419b0e35af42f22b3e127bcd08274d",
+            "size": 12768,
+            "ipfsCIDv1": "bafybeibdls2h4mpfw5gks3iirsne2qaez6uefwb5xmqkhahqbakvdszk6y"
+          },
+          "manifest": {
+            "versionName": "1.0.3",
+            "maxSdkVersion": 25,
+            "versionCode": 4,
+            "features": [
+              {
+                "name": "android.hardware.camera.front"
+              }
+            ],
+            "usesSdk": {
+              "minSdkVersion": 14,
+              "targetSdkVersion": 19
+            },
+            "signer": {
+              "sha256": [
+                "401a3a5843a3d5cebc22e6de5cb76d08eaa6797122d7fe1283df1d192e132f5e"
+              ]
+            },
+            "usesPermission": [
+              {
+                "name": "android.permission.CAMERA"
+              }
+            ]
+          }
+        }
+      }
+    },
     "souch.smsbypass": {
       "metadata": {
         "added": 1524700800000,
diff --git a/tests/repo/index.xml b/tests/repo/index.xml
index 4d7e8633..4036a6f7 100644
--- a/tests/repo/index.xml
+++ b/tests/repo/index.xml
@@ -147,6 +147,35 @@ APK is called F-Droid Privileged Extension.</desc>
 			<added>2016-03-10</added>
 		</package>
 	</application>
+	<application id="org.maxsdkversion">
+		<id>org.maxsdkversion</id>
+		<added>2025-02-17</added>
+		<lastupdated>2025-02-17</lastupdated>
+		<name>maxSdkVersion</name>
+		<summary>Test setting maxSdkVersion in an APK</summary>
+		<icon>org.maxsdkversion.4.png</icon>
+		<desc>No description available</desc>
+		<license>Unknown</license>
+		<web></web>
+		<source></source>
+		<tracker></tracker>
+		<marketversion></marketversion>
+		<marketvercode>4</marketvercode>
+		<package>
+			<version>1.0.3</version>
+			<versioncode>4</versioncode>
+			<apkname>org.maxsdkversion_4.apk</apkname>
+			<hash type="sha256">877d582369d2840fc0d6892e44feaaad21419b0e35af42f22b3e127bcd08274d</hash>
+			<size>12768</size>
+			<sdkver>14</sdkver>
+			<targetSdkVersion>19</targetSdkVersion>
+			<maxsdkver>25</maxsdkver>
+			<added>2025-02-17</added>
+			<sig>1a5e67bcef6b2d6242f2d36982b54589</sig>
+			<permissions>CAMERA</permissions>
+			<features>android.hardware.camera.front</features>
+		</package>
+	</application>
 	<application id="no.min.target.sdk">
 		<id>no.min.target.sdk</id>
 		<added>2018-10-10</added>
diff --git a/tests/repo/org.maxsdkversion_4.apk b/tests/repo/org.maxsdkversion_4.apk
new file mode 100644
index 0000000000000000000000000000000000000000..3957886176290934f69bf9c57d044f827f3f807f
GIT binary patch
literal 12768
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

literal 0
HcmV?d00001

diff --git a/tests/test_update.py b/tests/test_update.py
index 323dcace..dfe353b5 100755
--- a/tests/test_update.py
+++ b/tests/test_update.py
@@ -605,7 +605,7 @@ class UpdateTest(unittest.TestCase):
         apps = fdroidserver.metadata.read_metadata()
         knownapks = fdroidserver.common.KnownApks()
         apks, cachechanged = fdroidserver.update.process_apks({}, 'repo', knownapks, False)
-        self.assertEqual(len(apks), 17)
+        self.assertEqual(len(apks), 18)
         apk = apks[1]
         self.assertEqual(apk['packageName'], 'com.politedroid')
         self.assertEqual(apk['versionCode'], 3)
@@ -668,7 +668,7 @@ class UpdateTest(unittest.TestCase):
 
         fdroidserver.update.options.clean = False
         read_from_json = fdroidserver.update.get_cache()
-        self.assertEqual(19, len(read_from_json))
+        self.assertEqual(20, len(read_from_json))
         for f in glob.glob('repo/*.apk'):
             self.assertTrue(os.path.basename(f) in read_from_json)
 
@@ -1241,7 +1241,7 @@ class UpdateTest(unittest.TestCase):
         knownapks = fdroidserver.common.KnownApks()
         apks, cachechanged = fdroidserver.update.process_apks({}, 'repo', knownapks, False)
         fdroidserver.update.translate_per_build_anti_features(apps, apks)
-        self.assertEqual(len(apks), 17)
+        self.assertEqual(len(apks), 18)
         foundtest = False
         for apk in apks:
             if apk['packageName'] == 'com.politedroid' and apk['versionCode'] == 3:

From a69340a1eab674f43703bf5605e28d480b4ad3f9 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Tue, 18 Feb 2025 12:13:09 +0100
Subject: [PATCH 7/8] MANIFEST.in: case-insensitive ASCII byte value for stable
 sort

```
LC_ALL=C sort --ignore-case --stable --output=MANIFEST.in MANIFEST.in
```
---
 MANIFEST.in | 122 ++++++++++++++++++++++++++--------------------------
 1 file changed, 61 insertions(+), 61 deletions(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index cd5ed76a..e833d6f6 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -47,7 +47,6 @@ include locale/zh_Hans/LC_MESSAGES/fdroidserver.po
 include locale/zh_Hant/LC_MESSAGES/fdroidserver.po
 include makebuildserver
 include README.md
-include tests/__init__.py
 include tests/aosp_testkey_debug.keystore
 include tests/apk.embedded_1.apk
 include tests/bad-unicode-*.apk
@@ -60,10 +59,10 @@ include tests/build-tools/17.0.0/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/17.0.0/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/17.0.0/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/17.0.0/aapt-output-obb.main.oldversion_1444412523.txt
-include tests/build-tools/17.0.0/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/17.0.0/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/17.0.0/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/17.0.0/aapt-output-obb.main.twoversions_1101617.txt
+include tests/build-tools/17.0.0/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/17.0.0/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/17.0.0/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/18.1.1/aapt-output-com.moez.QKSMS_182.txt
@@ -75,10 +74,10 @@ include tests/build-tools/18.1.1/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/18.1.1/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/18.1.1/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/18.1.1/aapt-output-obb.main.oldversion_1444412523.txt
-include tests/build-tools/18.1.1/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/18.1.1/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/18.1.1/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/18.1.1/aapt-output-obb.main.twoversions_1101617.txt
+include tests/build-tools/18.1.1/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/18.1.1/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/18.1.1/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/19.0.0/aapt-output-com.moez.QKSMS_182.txt
@@ -90,10 +89,10 @@ include tests/build-tools/19.0.0/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/19.0.0/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/19.0.0/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/19.0.0/aapt-output-obb.main.oldversion_1444412523.txt
-include tests/build-tools/19.0.0/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/19.0.0/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/19.0.0/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/19.0.0/aapt-output-obb.main.twoversions_1101617.txt
+include tests/build-tools/19.0.0/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/19.0.0/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/19.0.0/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/19.1.0/aapt-output-com.moez.QKSMS_182.txt
@@ -105,10 +104,10 @@ include tests/build-tools/19.1.0/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/19.1.0/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/19.1.0/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/19.1.0/aapt-output-obb.main.oldversion_1444412523.txt
-include tests/build-tools/19.1.0/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/19.1.0/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/19.1.0/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/19.1.0/aapt-output-obb.main.twoversions_1101617.txt
+include tests/build-tools/19.1.0/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/19.1.0/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/19.1.0/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/20.0.0/aapt-output-com.moez.QKSMS_182.txt
@@ -120,10 +119,10 @@ include tests/build-tools/20.0.0/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/20.0.0/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/20.0.0/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/20.0.0/aapt-output-obb.main.oldversion_1444412523.txt
-include tests/build-tools/20.0.0/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/20.0.0/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/20.0.0/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/20.0.0/aapt-output-obb.main.twoversions_1101617.txt
+include tests/build-tools/20.0.0/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/20.0.0/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/20.0.0/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/21.1.1/aapt-output-com.moez.QKSMS_182.txt
@@ -135,10 +134,10 @@ include tests/build-tools/21.1.1/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/21.1.1/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/21.1.1/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/21.1.1/aapt-output-obb.main.oldversion_1444412523.txt
-include tests/build-tools/21.1.1/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/21.1.1/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/21.1.1/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/21.1.1/aapt-output-obb.main.twoversions_1101617.txt
+include tests/build-tools/21.1.1/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/21.1.1/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/21.1.1/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/21.1.2/aapt-output-com.moez.QKSMS_182.txt
@@ -150,10 +149,10 @@ include tests/build-tools/21.1.2/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/21.1.2/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/21.1.2/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/21.1.2/aapt-output-obb.main.oldversion_1444412523.txt
-include tests/build-tools/21.1.2/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/21.1.2/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/21.1.2/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/21.1.2/aapt-output-obb.main.twoversions_1101617.txt
+include tests/build-tools/21.1.2/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/21.1.2/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/21.1.2/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/22.0.0/aapt-output-com.moez.QKSMS_182.txt
@@ -165,10 +164,10 @@ include tests/build-tools/22.0.0/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/22.0.0/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/22.0.0/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/22.0.0/aapt-output-obb.main.oldversion_1444412523.txt
-include tests/build-tools/22.0.0/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/22.0.0/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/22.0.0/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/22.0.0/aapt-output-obb.main.twoversions_1101617.txt
+include tests/build-tools/22.0.0/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/22.0.0/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/22.0.0/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/22.0.1/aapt-output-com.moez.QKSMS_182.txt
@@ -180,10 +179,10 @@ include tests/build-tools/22.0.1/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/22.0.1/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/22.0.1/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/22.0.1/aapt-output-obb.main.oldversion_1444412523.txt
-include tests/build-tools/22.0.1/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/22.0.1/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/22.0.1/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/22.0.1/aapt-output-obb.main.twoversions_1101617.txt
+include tests/build-tools/22.0.1/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/22.0.1/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/22.0.1/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/23.0.0/aapt-output-com.moez.QKSMS_182.txt
@@ -195,10 +194,10 @@ include tests/build-tools/23.0.0/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/23.0.0/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/23.0.0/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/23.0.0/aapt-output-obb.main.oldversion_1444412523.txt
-include tests/build-tools/23.0.0/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/23.0.0/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/23.0.0/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/23.0.0/aapt-output-obb.main.twoversions_1101617.txt
+include tests/build-tools/23.0.0/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/23.0.0/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/23.0.0/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/23.0.1/aapt-output-com.moez.QKSMS_182.txt
@@ -210,10 +209,10 @@ include tests/build-tools/23.0.1/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/23.0.1/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/23.0.1/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/23.0.1/aapt-output-obb.main.oldversion_1444412523.txt
-include tests/build-tools/23.0.1/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/23.0.1/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/23.0.1/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/23.0.1/aapt-output-obb.main.twoversions_1101617.txt
+include tests/build-tools/23.0.1/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/23.0.1/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/23.0.1/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/23.0.2/aapt-output-com.moez.QKSMS_182.txt
@@ -225,10 +224,10 @@ include tests/build-tools/23.0.2/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/23.0.2/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/23.0.2/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/23.0.2/aapt-output-obb.main.oldversion_1444412523.txt
-include tests/build-tools/23.0.2/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/23.0.2/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/23.0.2/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/23.0.2/aapt-output-obb.main.twoversions_1101617.txt
+include tests/build-tools/23.0.2/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/23.0.2/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/23.0.2/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/23.0.3/aapt-output-com.moez.QKSMS_182.txt
@@ -240,10 +239,10 @@ include tests/build-tools/23.0.3/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/23.0.3/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/23.0.3/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/23.0.3/aapt-output-obb.main.oldversion_1444412523.txt
-include tests/build-tools/23.0.3/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/23.0.3/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/23.0.3/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/23.0.3/aapt-output-obb.main.twoversions_1101617.txt
+include tests/build-tools/23.0.3/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/23.0.3/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/23.0.3/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/24.0.0/aapt-output-com.moez.QKSMS_182.txt
@@ -255,10 +254,10 @@ include tests/build-tools/24.0.0/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/24.0.0/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/24.0.0/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/24.0.0/aapt-output-obb.main.oldversion_1444412523.txt
-include tests/build-tools/24.0.0/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/24.0.0/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/24.0.0/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/24.0.0/aapt-output-obb.main.twoversions_1101617.txt
+include tests/build-tools/24.0.0/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/24.0.0/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/24.0.0/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/24.0.1/aapt-output-com.moez.QKSMS_182.txt
@@ -270,10 +269,10 @@ include tests/build-tools/24.0.1/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/24.0.1/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/24.0.1/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/24.0.1/aapt-output-obb.main.oldversion_1444412523.txt
-include tests/build-tools/24.0.1/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/24.0.1/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/24.0.1/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/24.0.1/aapt-output-obb.main.twoversions_1101617.txt
+include tests/build-tools/24.0.1/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/24.0.1/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/24.0.1/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/24.0.2/aapt-output-com.moez.QKSMS_182.txt
@@ -285,10 +284,10 @@ include tests/build-tools/24.0.2/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/24.0.2/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/24.0.2/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/24.0.2/aapt-output-obb.main.oldversion_1444412523.txt
-include tests/build-tools/24.0.2/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/24.0.2/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/24.0.2/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/24.0.2/aapt-output-obb.main.twoversions_1101617.txt
+include tests/build-tools/24.0.2/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/24.0.2/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/24.0.2/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/24.0.3/aapt-output-com.moez.QKSMS_182.txt
@@ -300,10 +299,10 @@ include tests/build-tools/24.0.3/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/24.0.3/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/24.0.3/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/24.0.3/aapt-output-obb.main.oldversion_1444412523.txt
-include tests/build-tools/24.0.3/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/24.0.3/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/24.0.3/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/24.0.3/aapt-output-obb.main.twoversions_1101617.txt
+include tests/build-tools/24.0.3/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/24.0.3/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/24.0.3/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/25.0.0/aapt-output-com.moez.QKSMS_182.txt
@@ -315,10 +314,10 @@ include tests/build-tools/25.0.0/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/25.0.0/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/25.0.0/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/25.0.0/aapt-output-obb.main.oldversion_1444412523.txt
-include tests/build-tools/25.0.0/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/25.0.0/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/25.0.0/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/25.0.0/aapt-output-obb.main.twoversions_1101617.txt
+include tests/build-tools/25.0.0/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/25.0.0/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/25.0.0/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/25.0.1/aapt-output-com.moez.QKSMS_182.txt
@@ -330,10 +329,10 @@ include tests/build-tools/25.0.1/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/25.0.1/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/25.0.1/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/25.0.1/aapt-output-obb.main.oldversion_1444412523.txt
-include tests/build-tools/25.0.1/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/25.0.1/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/25.0.1/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/25.0.1/aapt-output-obb.main.twoversions_1101617.txt
+include tests/build-tools/25.0.1/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/25.0.1/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/25.0.1/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/25.0.2/aapt-output-com.moez.QKSMS_182.txt
@@ -345,10 +344,10 @@ include tests/build-tools/25.0.2/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/25.0.2/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/25.0.2/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/25.0.2/aapt-output-obb.main.oldversion_1444412523.txt
-include tests/build-tools/25.0.2/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/25.0.2/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/25.0.2/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/25.0.2/aapt-output-obb.main.twoversions_1101617.txt
+include tests/build-tools/25.0.2/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/25.0.2/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/25.0.2/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/25.0.3/aapt-output-com.moez.QKSMS_182.txt
@@ -360,10 +359,10 @@ include tests/build-tools/25.0.3/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/25.0.3/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/25.0.3/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/25.0.3/aapt-output-obb.main.oldversion_1444412523.txt
-include tests/build-tools/25.0.3/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/25.0.3/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/25.0.3/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/25.0.3/aapt-output-obb.main.twoversions_1101617.txt
+include tests/build-tools/25.0.3/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/25.0.3/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/25.0.3/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/26.0.0/aapt-output-com.moez.QKSMS_182.txt
@@ -375,10 +374,10 @@ include tests/build-tools/26.0.0/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/26.0.0/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/26.0.0/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/26.0.0/aapt-output-obb.main.oldversion_1444412523.txt
-include tests/build-tools/26.0.0/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/26.0.0/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/26.0.0/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/26.0.0/aapt-output-obb.main.twoversions_1101617.txt
+include tests/build-tools/26.0.0/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/26.0.0/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/26.0.0/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/26.0.1/aapt-output-com.moez.QKSMS_182.txt
@@ -390,10 +389,10 @@ include tests/build-tools/26.0.1/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/26.0.1/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/26.0.1/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/26.0.1/aapt-output-obb.main.oldversion_1444412523.txt
-include tests/build-tools/26.0.1/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/26.0.1/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/26.0.1/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/26.0.1/aapt-output-obb.main.twoversions_1101617.txt
+include tests/build-tools/26.0.1/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/26.0.1/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/26.0.1/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/26.0.2/aapt-output-com.moez.QKSMS_182.txt
@@ -405,10 +404,10 @@ include tests/build-tools/26.0.2/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/26.0.2/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/26.0.2/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/26.0.2/aapt-output-obb.main.oldversion_1444412523.txt
-include tests/build-tools/26.0.2/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/26.0.2/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/26.0.2/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/26.0.2/aapt-output-obb.main.twoversions_1101617.txt
+include tests/build-tools/26.0.2/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/26.0.2/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/26.0.2/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/26.0.3/aapt-output-com.moez.QKSMS_182.txt
@@ -420,10 +419,10 @@ include tests/build-tools/26.0.3/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/26.0.3/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/26.0.3/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/26.0.3/aapt-output-obb.main.oldversion_1444412523.txt
-include tests/build-tools/26.0.3/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/26.0.3/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/26.0.3/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/26.0.3/aapt-output-obb.main.twoversions_1101617.txt
+include tests/build-tools/26.0.3/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/26.0.3/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/26.0.3/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/27.0.0/aapt-output-com.moez.QKSMS_182.txt
@@ -435,10 +434,10 @@ include tests/build-tools/27.0.0/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/27.0.0/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/27.0.0/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/27.0.0/aapt-output-obb.main.oldversion_1444412523.txt
-include tests/build-tools/27.0.0/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/27.0.0/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/27.0.0/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/27.0.0/aapt-output-obb.main.twoversions_1101617.txt
+include tests/build-tools/27.0.0/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/27.0.0/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/27.0.0/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/27.0.1/aapt-output-com.moez.QKSMS_182.txt
@@ -450,10 +449,10 @@ include tests/build-tools/27.0.1/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/27.0.1/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/27.0.1/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/27.0.1/aapt-output-obb.main.oldversion_1444412523.txt
-include tests/build-tools/27.0.1/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/27.0.1/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/27.0.1/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/27.0.1/aapt-output-obb.main.twoversions_1101617.txt
+include tests/build-tools/27.0.1/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/27.0.1/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/27.0.1/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/27.0.2/aapt-output-com.moez.QKSMS_182.txt
@@ -465,10 +464,10 @@ include tests/build-tools/27.0.2/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/27.0.2/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/27.0.2/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/27.0.2/aapt-output-obb.main.oldversion_1444412523.txt
-include tests/build-tools/27.0.2/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/27.0.2/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/27.0.2/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/27.0.2/aapt-output-obb.main.twoversions_1101617.txt
+include tests/build-tools/27.0.2/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/27.0.2/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/27.0.2/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/27.0.3/aapt-output-com.moez.QKSMS_182.txt
@@ -480,10 +479,10 @@ include tests/build-tools/27.0.3/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/27.0.3/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/27.0.3/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/27.0.3/aapt-output-obb.main.oldversion_1444412523.txt
-include tests/build-tools/27.0.3/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/27.0.3/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/27.0.3/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/27.0.3/aapt-output-obb.main.twoversions_1101617.txt
+include tests/build-tools/27.0.3/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/27.0.3/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/27.0.3/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/28.0.0/aapt-output-com.moez.QKSMS_182.txt
@@ -495,10 +494,10 @@ include tests/build-tools/28.0.0/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/28.0.0/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/28.0.0/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/28.0.0/aapt-output-obb.main.oldversion_1444412523.txt
-include tests/build-tools/28.0.0/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/28.0.0/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/28.0.0/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/28.0.0/aapt-output-obb.main.twoversions_1101617.txt
+include tests/build-tools/28.0.0/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/28.0.0/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/28.0.0/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/28.0.1/aapt-output-com.moez.QKSMS_182.txt
@@ -510,10 +509,10 @@ include tests/build-tools/28.0.1/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/28.0.1/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/28.0.1/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/28.0.1/aapt-output-obb.main.oldversion_1444412523.txt
-include tests/build-tools/28.0.1/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/28.0.1/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/28.0.1/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/28.0.1/aapt-output-obb.main.twoversions_1101617.txt
+include tests/build-tools/28.0.1/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/28.0.1/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/28.0.1/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/28.0.2/aapt-output-com.politedroid_3.txt
@@ -524,10 +523,10 @@ include tests/build-tools/28.0.2/aapt-output-duplicate.permisssions_9999999.txt
 include tests/build-tools/28.0.2/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/28.0.2/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/28.0.2/aapt-output-obb.main.oldversion_1444412523.txt
-include tests/build-tools/28.0.2/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/28.0.2/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/28.0.2/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/28.0.2/aapt-output-obb.main.twoversions_1101617.txt
+include tests/build-tools/28.0.2/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/28.0.2/aapt-output-org.droidtr.keyboard_34.txt
 include tests/build-tools/28.0.2/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/28.0.3/aapt-output-com.example.test.helloworld_1.txt
@@ -540,10 +539,10 @@ include tests/build-tools/28.0.3/aapt-output-info.guardianproject.urzip_100.txt
 include tests/build-tools/28.0.3/aapt-output-info.zwanenburg.caffeinetile_4.txt
 include tests/build-tools/28.0.3/aapt-output-no.min.target.sdk_987.txt
 include tests/build-tools/28.0.3/aapt-output-obb.main.oldversion_1444412523.txt
-include tests/build-tools/28.0.3/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/28.0.3/aapt-output-obb.main.twoversions_1101613.txt
 include tests/build-tools/28.0.3/aapt-output-obb.main.twoversions_1101615.txt
 include tests/build-tools/28.0.3/aapt-output-obb.main.twoversions_1101617.txt
+include tests/build-tools/28.0.3/aapt-output-obb.mainpatch.current_1619.txt
 include tests/build-tools/28.0.3/aapt-output-souch.smsbypass_9.txt
 include tests/build-tools/generate.sh
 include tests/check-fdroid-apk
@@ -572,11 +571,11 @@ include tests/dump_internal_metadata_format.py
 include tests/extra/manual-vmtools-test.py
 include tests/funding-usernames.yaml
 include tests/get_android_tools_versions/android-ndk-r10e/RELEASE.TXT
+include tests/get_android_tools_versions/android-sdk/ndk-bundle/package.xml
+include tests/get_android_tools_versions/android-sdk/ndk-bundle/source.properties
 include tests/get_android_tools_versions/android-sdk/ndk/11.2.2725575/source.properties
 include tests/get_android_tools_versions/android-sdk/ndk/17.2.4988734/source.properties
 include tests/get_android_tools_versions/android-sdk/ndk/21.3.6528147/source.properties
-include tests/get_android_tools_versions/android-sdk/ndk-bundle/package.xml
-include tests/get_android_tools_versions/android-sdk/ndk-bundle/source.properties
 include tests/get_android_tools_versions/android-sdk/patcher/v4/source.properties
 include tests/get_android_tools_versions/android-sdk/platforms/android-30/source.properties
 include tests/get_android_tools_versions/android-sdk/skiaparser/1/source.properties
@@ -594,8 +593,11 @@ include tests/issue-1128-poc2.apk
 include tests/issue-1128-poc3a.apk
 include tests/issue-1128-poc3b.apk
 include tests/janus.apk
-include tests/keystore.jks
 include tests/key-tricks.py
+include tests/keystore.jks
+include tests/metadata-rewrite-yml/app.with.special.build.params.yml
+include tests/metadata-rewrite-yml/fake.ota.update.yml
+include tests/metadata-rewrite-yml/org.fdroid.fdroid.yml
 include tests/metadata/apk/info.guardianproject.urzip.yaml
 include tests/metadata/apk/org.dyndns.fules.ck.yaml
 include tests/metadata/app.with.special.build.params.yml
@@ -613,13 +615,14 @@ include tests/metadata/dump/org.smssecure.smssecure.yaml
 include tests/metadata/dump/org.videolan.vlc.yaml
 include tests/metadata/duplicate.permisssions.yml
 include tests/metadata/fake.ota.update.yml
+include tests/metadata/info.guardianproject.checkey.yml
 include tests/metadata/info.guardianproject.checkey/en-US/description.txt
 include tests/metadata/info.guardianproject.checkey/en-US/name.txt
 include tests/metadata/info.guardianproject.checkey/en-US/phoneScreenshots/checkey-phone.png
 include tests/metadata/info.guardianproject.checkey/en-US/phoneScreenshots/checkey.png
 include tests/metadata/info.guardianproject.checkey/en-US/summary.txt
 include tests/metadata/info.guardianproject.checkey/ja-JP/name.txt
-include tests/metadata/info.guardianproject.checkey.yml
+include tests/metadata/info.guardianproject.urzip.yml
 include tests/metadata/info.guardianproject.urzip/en-US/changelogs/100.txt
 include tests/metadata/info.guardianproject.urzip/en-US/changelogs/default.txt
 include tests/metadata/info.guardianproject.urzip/en-US/full_description.txt
@@ -628,28 +631,24 @@ include tests/metadata/info.guardianproject.urzip/en-US/images/icon.png
 include tests/metadata/info.guardianproject.urzip/en-US/short_description.txt
 include tests/metadata/info.guardianproject.urzip/en-US/title.txt
 include tests/metadata/info.guardianproject.urzip/en-US/video.txt
-include tests/metadata/info.guardianproject.urzip.yml
 include tests/metadata/info.zwanenburg.caffeinetile.yml
 include tests/metadata/no.min.target.sdk.yml
 include tests/metadata/obb.main.oldversion.yml
-include tests/metadata/obb.mainpatch.current.yml
 include tests/metadata/obb.main.twoversions.yml
+include tests/metadata/obb.mainpatch.current.yml
 include tests/metadata/org.adaway.yml
 include tests/metadata/org.fdroid.ci.test.app.yml
 include tests/metadata/org.fdroid.fdroid.yml
 include tests/metadata/org.maxsdkversion.yml
+include tests/metadata/org.smssecure.smssecure.yml
 include tests/metadata/org.smssecure.smssecure/signatures/134/28969C09.RSA
 include tests/metadata/org.smssecure.smssecure/signatures/134/28969C09.SF
 include tests/metadata/org.smssecure.smssecure/signatures/134/MANIFEST.MF
 include tests/metadata/org.smssecure.smssecure/signatures/135/28969C09.RSA
 include tests/metadata/org.smssecure.smssecure/signatures/135/28969C09.SF
 include tests/metadata/org.smssecure.smssecure/signatures/135/MANIFEST.MF
-include tests/metadata/org.smssecure.smssecure.yml
 include tests/metadata/org.videolan.vlc.yml
 include tests/metadata/raw.template.yml
-include tests/metadata-rewrite-yml/app.with.special.build.params.yml
-include tests/metadata-rewrite-yml/fake.ota.update.yml
-include tests/metadata-rewrite-yml/org.fdroid.fdroid.yml
 include tests/metadata/souch.smsbypass.yml
 include tests/minimal_targetsdk_30_unsigned.apk
 include tests/Norway_bouvet_europe_2.obf.zip
@@ -680,16 +679,16 @@ include tests/repo/main.1434483388.obb.main.oldversion.obb
 include tests/repo/main.1619.obb.mainpatch.current.obb
 include tests/repo/no.min.target.sdk_987.apk
 include tests/repo/obb.main.oldversion_1444412523.apk
-include tests/repo/obb.mainpatch.current_1619_another-release-key.apk
-include tests/repo/obb.mainpatch.current_1619.apk
-include tests/repo/obb.mainpatch.current/en-US/featureGraphic.png
-include tests/repo/obb.mainpatch.current/en-US/icon.png
-include tests/repo/obb.mainpatch.current/en-US/phoneScreenshots/screenshot-main.png
-include tests/repo/obb.mainpatch.current/en-US/sevenInchScreenshots/screenshot-tablet-main.png
 include tests/repo/obb.main.twoversions_1101613.apk
 include tests/repo/obb.main.twoversions_1101615.apk
 include tests/repo/obb.main.twoversions_1101617.apk
 include tests/repo/obb.main.twoversions_1101617_src.tar.gz
+include tests/repo/obb.mainpatch.current/en-US/featureGraphic.png
+include tests/repo/obb.mainpatch.current/en-US/icon.png
+include tests/repo/obb.mainpatch.current/en-US/phoneScreenshots/screenshot-main.png
+include tests/repo/obb.mainpatch.current/en-US/sevenInchScreenshots/screenshot-tablet-main.png
+include tests/repo/obb.mainpatch.current_1619.apk
+include tests/repo/obb.mainpatch.current_1619_another-release-key.apk
 include tests/repo/org.maxsdkversion_4.apk
 include tests/repo/org.videolan.vlc/en-US/icon.png
 include tests/repo/org.videolan.vlc/en-US/phoneScreenshots/screenshot10.png
@@ -702,16 +701,16 @@ include tests/repo/org.videolan.vlc/en-US/phoneScreenshots/screenshot4.png
 include tests/repo/org.videolan.vlc/en-US/phoneScreenshots/screenshot7.png
 include tests/repo/org.videolan.vlc/en-US/phoneScreenshots/screenshot9.png
 include tests/repo/org.videolan.vlc/en-US/sevenInchScreenshots/screenshot0.png
+include tests/repo/org.videolan.vlc/en-US/sevenInchScreenshots/screenshot1.png
 include tests/repo/org.videolan.vlc/en-US/sevenInchScreenshots/screenshot11.png
 include tests/repo/org.videolan.vlc/en-US/sevenInchScreenshots/screenshot13.png
 include tests/repo/org.videolan.vlc/en-US/sevenInchScreenshots/screenshot14.png
 include tests/repo/org.videolan.vlc/en-US/sevenInchScreenshots/screenshot16.png
 include tests/repo/org.videolan.vlc/en-US/sevenInchScreenshots/screenshot17.png
 include tests/repo/org.videolan.vlc/en-US/sevenInchScreenshots/screenshot19.png
-include tests/repo/org.videolan.vlc/en-US/sevenInchScreenshots/screenshot1.png
+include tests/repo/org.videolan.vlc/en-US/sevenInchScreenshots/screenshot2.png
 include tests/repo/org.videolan.vlc/en-US/sevenInchScreenshots/screenshot21.png
 include tests/repo/org.videolan.vlc/en-US/sevenInchScreenshots/screenshot23.png
-include tests/repo/org.videolan.vlc/en-US/sevenInchScreenshots/screenshot2.png
 include tests/repo/org.videolan.vlc/en-US/sevenInchScreenshots/screenshot3.png
 include tests/repo/org.videolan.vlc/en-US/sevenInchScreenshots/screenshot5.png
 include tests/repo/org.videolan.vlc/en-US/sevenInchScreenshots/screenshot6.png
@@ -724,20 +723,20 @@ include tests/run-tests
 include tests/SANAPPSI.RSA
 include tests/SANAPPSI.SF
 include tests/shared_test_code.py
-include tests/signindex/guardianproject.jar
 include tests/signindex/guardianproject-v1.jar
+include tests/signindex/guardianproject.jar
 include tests/signindex/testy.jar
 include tests/signindex/unsigned.jar
 include tests/source-files/at.bitfire.davdroid/build.gradle
 include tests/source-files/catalog.test/app/build.gradle
+include tests/source-files/catalog.test/build.gradle.kts
 include tests/source-files/catalog.test/buildSrc/build.gradle.kts
 include tests/source-files/catalog.test/buildSrc/settings.gradle.kts
 include tests/source-files/catalog.test/buildSrc2/build.gradle.kts
 include tests/source-files/catalog.test/buildSrc2/settings.gradle.kts
-include tests/source-files/catalog.test/build.gradle.kts
 include tests/source-files/catalog.test/core/build.gradle
-include tests/source-files/catalog.test/libs.versions.toml
 include tests/source-files/catalog.test/gradle/libs.versions.toml
+include tests/source-files/catalog.test/libs.versions.toml
 include tests/source-files/catalog.test/settings.gradle.kts
 include tests/source-files/cn.wildfirechat.chat/avenginekit/build.gradle
 include tests/source-files/cn.wildfirechat.chat/build.gradle
@@ -770,21 +769,21 @@ include tests/source-files/com.integreight.onesheeld/pullToRefreshlibrary/src/ma
 include tests/source-files/com.integreight.onesheeld/quickReturnHeader/build.gradle
 include tests/source-files/com.integreight.onesheeld/quickReturnHeader/src/main/AndroidManifest.xml
 include tests/source-files/com.integreight.onesheeld/settings.gradle
-include tests/source-files/com.jens.automation2/build.gradle
 include tests/source-files/com.jens.automation2/app/build.gradle
+include tests/source-files/com.jens.automation2/build.gradle
 include tests/source-files/com.kunzisoft.testcase/build.gradle
 include tests/source-files/com.lolo.io.onelist/app/build.gradle.kts
 include tests/source-files/com.lolo.io.onelist/build.gradle.kts
 include tests/source-files/com.lolo.io.onelist/gradle/libs.versions.toml
 include tests/source-files/com.lolo.io.onelist/gradle/wrapper/gradle-wrapper.properties
 include tests/source-files/com.lolo.io.onelist/settings.gradle
-include tests/source-files/com.nextcloud.client/build.gradle
 include tests/source-files/com.nextcloud.client.dev/src/generic/fastlane/metadata/android/en-US/full_description.txt
 include tests/source-files/com.nextcloud.client.dev/src/generic/fastlane/metadata/android/en-US/short_description.txt
 include tests/source-files/com.nextcloud.client.dev/src/generic/fastlane/metadata/android/en-US/title.txt
 include tests/source-files/com.nextcloud.client.dev/src/versionDev/fastlane/metadata/android/en-US/full_description.txt
 include tests/source-files/com.nextcloud.client.dev/src/versionDev/fastlane/metadata/android/en-US/short_description.txt
 include tests/source-files/com.nextcloud.client.dev/src/versionDev/fastlane/metadata/android/en-US/title.txt
+include tests/source-files/com.nextcloud.client/build.gradle
 include tests/source-files/com.nextcloud.client/src/generic/fastlane/metadata/android/en-US/full_description.txt
 include tests/source-files/com.nextcloud.client/src/generic/fastlane/metadata/android/en-US/short_description.txt
 include tests/source-files/com.nextcloud.client/src/generic/fastlane/metadata/android/en-US/title.txt
@@ -810,10 +809,10 @@ include tests/source-files/lockfile.test/flutter/pubspec.lock
 include tests/source-files/lockfile.test/flutter/pubspec.yaml
 include tests/source-files/lockfile.test/javascript/package.json
 include tests/source-files/lockfile.test/javascript/yarn.lock
-include tests/source-files/lockfile.test/rust/subdir2/Cargo.toml
 include tests/source-files/lockfile.test/rust/subdir/Cargo.lock
 include tests/source-files/lockfile.test/rust/subdir/Cargo.toml
 include tests/source-files/lockfile.test/rust/subdir/subdir/subdir/Cargo.toml
+include tests/source-files/lockfile.test/rust/subdir2/Cargo.toml
 include tests/source-files/open-keychain/open-keychain/build.gradle
 include tests/source-files/open-keychain/open-keychain/OpenKeychain/build.gradle
 include tests/source-files/org.mozilla.rocket/app/build.gradle
@@ -869,8 +868,8 @@ include tests/test_signatures.py
 include tests/test_signindex.py
 include tests/test_update.py
 include tests/test_vcs.py
-include tests/triple-t-2/build/org.piwigo.android/app/build.gradle
 include tests/triple-t-2/build/org.piwigo.android/app/.gitignore
+include tests/triple-t-2/build/org.piwigo.android/app/build.gradle
 include tests/triple-t-2/build/org.piwigo.android/app/src/debug/res/values/constants.xml
 include tests/triple-t-2/build/org.piwigo.android/app/src/debug/res/values/strings.xml
 include tests/triple-t-2/build/org.piwigo.android/app/src/main/java/org/piwigo/PiwigoApplication.java
@@ -925,12 +924,13 @@ include tests/triple-t-multiple/build/ch.admin.bag.covidcertificate.wallet/verif
 include tests/triple-t-multiple/build/ch.admin.bag.covidcertificate.wallet/wallet/src/main/play/listings/en-US/title.txt
 include tests/triple-t-multiple/metadata/ch.admin.bag.covidcertificate.verifier.yml
 include tests/triple-t-multiple/metadata/ch.admin.bag.covidcertificate.wallet.yml
-include tests/urzip.apk
 include tests/urzip-badcert.apk
 include tests/urzip-badsig.apk
-include tests/urzip-release.apk
 include tests/urzip-release-unsigned.apk
+include tests/urzip-release.apk
+include tests/urzip.apk
 include tests/v2.only.sig_2.apk
 include tests/valid-package-names/random-package-names
 include tests/valid-package-names/RandomPackageNames.java
 include tests/valid-package-names/test.py
+include tests/__init__.py

From 59474437b392ee2463e1b9fa5e08db5459eb28d8 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Wed, 5 Mar 2025 17:43:50 +0100
Subject: [PATCH 8/8] delete cruft test script

---
 tests/parse-fdroiddata-mirror-config.py | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 tests/parse-fdroiddata-mirror-config.py

diff --git a/tests/parse-fdroiddata-mirror-config.py b/tests/parse-fdroiddata-mirror-config.py
deleted file mode 100644
index f909e910..00000000
--- a/tests/parse-fdroiddata-mirror-config.py
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env python3
-
-import ruamel.yaml
-
-from pathlib import Path
-
-mirrors_yml = Path('/home/hans/code/fdroid/fdroiddata/config/mirrors.yml')
-with mirrors_yml.open() as fp:
-    mirrors_config = ruamel.yaml.YAML(typ='safe').load(fp)
-
-for d in mirrors_config:
-    d['url'] += '/repo'
-    print(d, end=',\n')