fdroidserver 2.4.3__tar.gz → 2.4.5__tar.gz

{fdroidserver-2.4.3 → fdroidserver-2.4.5}/CHANGELOG.md

@@ -4,6 +4,15 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
+## [2.4.5] - 2026-06-03
+
+* Fixed crash when using Androguard v4.1.4+
+  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1833
+
+## [2.4.4] - 2026-05-01
+
+* Fixed tests to work with _sdkmanager_ v0.7.x
+
 ## [2.4.3] - 2025-12-04
 
 ### Fixed

{fdroidserver-2.4.3 → fdroidserver-2.4.5}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: fdroidserver
-Version: 2.4.3
+Version: 2.4.5
 Summary: F-Droid Server Tools
 Home-page: https://f-droid.org
 Author: The F-Droid Project
@@ -26,10 +26,52 @@ Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Topic :: Utilities
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
-Provides-Extra: docs
+License-File: LICENSE
+Requires-Dist: platformdirs
+Requires-Dist: androguard>=3.3.5
+Requires-Dist: asn1crypto
+Requires-Dist: biplist; sys_platform == "darwin"
+Requires-Dist: clint
+Requires-Dist: defusedxml
+Requires-Dist: GitPython
+Requires-Dist: oscrypto
+Requires-Dist: paramiko
+Requires-Dist: Pillow
+Requires-Dist: apache-libcloud>=0.14.1
+Requires-Dist: puremagic
+Requires-Dist: pycountry; sys_platform == "darwin"
+Requires-Dist: python-vagrant
+Requires-Dist: PyYAML
+Requires-Dist: qrcode
+Requires-Dist: ruamel.yaml<0.17.22,>=0.15
+Requires-Dist: requests!=2.11.0,!=2.12.2,!=2.18.0,>=2.5.2
+Requires-Dist: sdkmanager>=0.6.4
+Requires-Dist: yamllint
+Requires-Dist: tomli>=1.1.0; python_version < "3.11"
 Provides-Extra: optional
+Requires-Dist: biplist; extra == "optional"
+Requires-Dist: pycountry; extra == "optional"
+Requires-Dist: python-magic; extra == "optional"
 Provides-Extra: test
-License-File: LICENSE
+Requires-Dist: html5print; extra == "test"
+Requires-Dist: pyjks; extra == "test"
+Provides-Extra: docs
+Requires-Dist: numpydoc; extra == "docs"
+Requires-Dist: pydata_sphinx_theme; extra == "docs"
+Requires-Dist: pydocstyle; extra == "docs"
+Requires-Dist: sphinx; extra == "docs"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 <div align="center">
 

{fdroidserver-2.4.3 → fdroidserver-2.4.5}/fdroidserver/common.py

@@ -3393,23 +3393,22 @@ def get_first_signer_certificate(apkpath):
     .(RSA|DSA|EC) against the corresponding signature file .SF
     https://android.googlesource.com/platform/tools/apksig/+/refs/tags/android-13.0.0_r3/src/main/java/com/android/apksig/internal/apk/v1/V1SchemeVerifier.java#280
 
-    NoOverwriteDict is a workaround for:
-    https://github.com/androguard/androguard/issues/1030
-
     Lots more discusion here:
     https://gitlab.com/fdroid/fdroidserver/-/issues/1128
 
     """
-
-    class NoOverwriteDict(dict):
-        def __setitem__(self, k, v):
-            if k not in self:
-                super().__setitem__(k, v)
-
     cert_encoded = None
     found_certs = []
     apkobject = get_androguard_APK(apkpath)
-    apkobject._v2_blocks = NoOverwriteDict()
+    if isinstance(apkobject._v2_blocks, dict):
+        # Fixed in Androguard v4.1.4. NoOverwriteDict is a workaround for:
+        # https://github.com/androguard/androguard/issues/1030
+        class NoOverwriteDict(dict):
+            def __setitem__(self, k, v):
+                if k not in self:
+                    super().__setitem__(k, v)
+
+        apkobject._v2_blocks = NoOverwriteDict()
     certs_v3 = apkobject.get_certificates_der_v3()
     if certs_v3:
         cert_v3 = certs_v3[0]

{fdroidserver-2.4.3 → fdroidserver-2.4.5}/fdroidserver.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: fdroidserver
-Version: 2.4.3
+Version: 2.4.5
 Summary: F-Droid Server Tools
 Home-page: https://f-droid.org
 Author: The F-Droid Project
@@ -26,10 +26,52 @@ Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Topic :: Utilities
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
-Provides-Extra: docs
+License-File: LICENSE
+Requires-Dist: platformdirs
+Requires-Dist: androguard>=3.3.5
+Requires-Dist: asn1crypto
+Requires-Dist: biplist; sys_platform == "darwin"
+Requires-Dist: clint
+Requires-Dist: defusedxml
+Requires-Dist: GitPython
+Requires-Dist: oscrypto
+Requires-Dist: paramiko
+Requires-Dist: Pillow
+Requires-Dist: apache-libcloud>=0.14.1
+Requires-Dist: puremagic
+Requires-Dist: pycountry; sys_platform == "darwin"
+Requires-Dist: python-vagrant
+Requires-Dist: PyYAML
+Requires-Dist: qrcode
+Requires-Dist: ruamel.yaml<0.17.22,>=0.15
+Requires-Dist: requests!=2.11.0,!=2.12.2,!=2.18.0,>=2.5.2
+Requires-Dist: sdkmanager>=0.6.4
+Requires-Dist: yamllint
+Requires-Dist: tomli>=1.1.0; python_version < "3.11"
 Provides-Extra: optional
+Requires-Dist: biplist; extra == "optional"
+Requires-Dist: pycountry; extra == "optional"
+Requires-Dist: python-magic; extra == "optional"
 Provides-Extra: test
-License-File: LICENSE
+Requires-Dist: html5print; extra == "test"
+Requires-Dist: pyjks; extra == "test"
+Provides-Extra: docs
+Requires-Dist: numpydoc; extra == "docs"
+Requires-Dist: pydata_sphinx_theme; extra == "docs"
+Requires-Dist: pydocstyle; extra == "docs"
+Requires-Dist: sphinx; extra == "docs"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 <div align="center">
 

{fdroidserver-2.4.3 → fdroidserver-2.4.5}/setup.py

@@ -70,7 +70,7 @@ with open("README.md", "r") as fh:
 
 setup(
     name='fdroidserver',
-    version='2.4.3',
+    version='2.4.5',
     description='F-Droid Server Tools',
     long_description=long_description,
     long_description_content_type='text/markdown',

{fdroidserver-2.4.3 → fdroidserver-2.4.5}/tests/test_common.py

@@ -2426,10 +2426,18 @@ class CommonTest(SetUpTearDownMixin, unittest.TestCase):
         build = fdroidserver.metadata.Build()
         url = 'https://dl.google.com/android/repository/android-ndk-r24-linux.zip'
         path = sdkmanager.get_cachedir() / os.path.basename(url)
-        sdkmanager.packages = {
-            ('ndk', '24.0.8215888'): url,
-            ('ndk', 'r24'): url,
-        }
+        sdkmanager._process_checksums(
+            {
+                "https://dl.google.com/android/repository/android-ndk-r24-linux.zip": [
+                    {
+                        "sha1": "eceb18f147282eb93615eff1ad84a9d3962fbb31",
+                        "sha256": "caac638f060347c9aae994e718ba00bb18413498d8e0ad4e12e1482964032997",
+                        "sha512": "f316487172c7dbe9381297ba2e78a42f3458cc3cc0440045a043dd1abc88ecb3ba41325863d02b744dbb700c1ca6525c4ae07f3a1daa1c3dbfcfa161ae83c2ce",
+                        "source.properties": "Pkg.Desc = Android NDK\nPkg.Revision = 24.0.8215888\n",
+                    }
+                ],
+            }
+        )
         build.ndk = 'r24'
         firstrun = mock.Mock()
         with mock.patch('sdkmanager.download_file', firstrun):