fdroidserver 2.3.4__tar.gz → 2.3.5__tar.gz

fdroidserver-2.3.5/.bandit

@@ -0,0 +1,3 @@
+[bandit]
+skips: B110,B404,B408,B603,B607
+targets: .

{fdroidserver-2.3.4 → fdroidserver-2.3.5}/.gitlab-ci.yml

@@ -168,7 +168,7 @@ ubuntu_jammy_pip:
     # back to bare machine to act as user's install machine
     - export ANDROID_HOME=/opt/android-sdk
     - $pip install sdkmanager
-    - sdkmanager 'build-tools;33.0.0'
+    - sdkmanager 'build-tools;35.0.0'
 
     # Install extras_require.optional from setup.py
     - $pip install biplist pycountry
@@ -176,28 +176,13 @@ ubuntu_jammy_pip:
     - $pip install dist/fdroidserver-*.tar.gz
     - tar xzf dist/fdroidserver-*.tar.gz
     - cd fdroidserver-*
-    - export PATH=$PATH:$ANDROID_HOME/build-tools/33.0.0
+    - export PATH=$PATH:$ANDROID_HOME/build-tools/35.0.0
     - fdroid=`which fdroid` ./tests/run-tests
 
     # check localization was properly installed
     - LANGUAGE='de' fdroid --help | grep 'Gültige Befehle sind'
 
 
-# test installation process on a bleeding edge distro with pip
-arch_pip_install:
-  image: archlinux
-  only:
-    - master@fdroid/fdroidserver
-  script:
-    - pacman --sync --sysupgrade --refresh --noconfirm gcc git grep python-pip python-virtualenv python-wheel tar
-    - python -m venv venv
-    - source venv/bin/activate
-    - pip install -e .[test]
-    - fdroid
-    - fdroid readmeta
-    - fdroid update --help
-
-
 # The gradlew-fdroid tests are isolated from the rest of the test
 # suite, so they run as their own job.
 gradlew-fdroid:

{fdroidserver-2.3.4 → fdroidserver-2.3.5}/CHANGELOG.md

@@ -12,6 +12,17 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 ### Removed
 
+## [2.3.5] - 2025-01-20
+
+### Fixed
+
+* Fix issue where APKs with v1-only signatures and targetSdkVersion < 30 could
+  be maliciously crafted to bypass AllowedAPKSigningKeys
+  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1588
+* Ignore apksigner v33.x, it has bugs verifying APKs with v3/v3.1 sigs.
+  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1593
+* Sync translations for: ca cs de es fr ga ja pt_BR pt_PT ru sq sr uk zh_Hans
+
 ## [2.3.4] - 2024-12-12
 
 ### Fixed

{fdroidserver-2.3.4 → fdroidserver-2.3.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fdroidserver
-Version: 2.3.4
+Version: 2.3.5
 Summary: F-Droid Server Tools
 Home-page: https://f-droid.org
 Author: The F-Droid Project

fdroidserver-2.3.5/dev/fdroid_scan-binary.py

@@ -0,0 +1,38 @@
+#!/usr/bin/env python3
+#
+# an fdroid plugin for setting up srclibs
+#
+# The 'fdroid build' gitlab-ci job uses --on-server, which does not
+# set up the srclibs.  This plugin does the missing setup.
+
+import glob
+import os
+from argparse import ArgumentParser
+from fdroidserver import _, common, scanner
+
+
+fdroid_summary = 'Run scanner.scan_binary on APKs'
+
+
+def main():
+    parser = ArgumentParser()
+    common.setup_global_opts(parser)
+    parser.add_argument("APK", nargs='*', help=_("Path to a signed or unsigned APK."))
+    options = common.parse_args(parser)
+    common.read_config()
+    if options.APK:
+        apks = options.APK
+    else:
+        apks = glob.glob(os.path.join('unsigned', '*.apk'))
+
+    errors = 0
+    for apk in apks:
+        print('Scanning', apk, '...')
+        if scanner.scan_binary(apk):
+            print("ERROR: Found blocklisted packages in:", apk)
+            errors += 1
+    exit(errors)
+
+
+if __name__ == "__main__":
+    main()

{fdroidserver-2.3.4 → fdroidserver-2.3.5}/fdroidserver/common.py

@@ -85,6 +85,7 @@ DEFAULT_LOCALE = 'en-US'
 # this is the build-tools version, aapt has a separate version that
 # has to be manually set in test_aapt_version()
 MINIMUM_AAPT_BUILD_TOOLS_VERSION = '26.0.0'
+# 33.0.x has a bug that verifies APKs it shouldn't https://gitlab.com/fdroid/fdroidserver/-/issues/1253
 # 31.0.0 is the first version to support --v4-signing-enabled.
 # we only require 30.0.0 for now as that's the version in buster-backports, see also signindex.py
 # 26.0.2 is the first version recognizing md5 based signatures as valid again
@@ -94,7 +95,7 @@ MINIMUM_APKSIGNER_BUILD_TOOLS_VERSION = '30.0.0'
 VERCODE_OPERATION_RE = re.compile(r'^([ 0-9/*+-]|%c)+$')
 
 # A signature block file with a .DSA, .RSA, or .EC extension
-SIGNATURE_BLOCK_FILE_REGEX = re.compile(r'^META-INF/.*\.(DSA|EC|RSA)$')
+SIGNATURE_BLOCK_FILE_REGEX = re.compile(r'\AMETA-INF/.*\.(DSA|EC|RSA)\Z', re.DOTALL)
 APK_NAME_REGEX = re.compile(r'^([a-zA-Z][\w.]*)_(-?[0-9]+)_?([0-9a-f]{7})?\.apk')
 APK_ID_TRIPLET_REGEX = re.compile(r"^package: name='(\w[^']*)' versionCode='([^']+)' versionName='([^']*)'")
 STANDARD_FILE_NAME_REGEX = re.compile(r'^(\w[\w.]*)_(-?[0-9]+)\.\w+')
@@ -841,7 +842,15 @@ def find_apksigner(config):
         if not os.path.isdir(os.path.join(build_tools_path, f)):
             continue
         try:
-            if LooseVersion(f) < LooseVersion(MINIMUM_APKSIGNER_BUILD_TOOLS_VERSION):
+            version = LooseVersion(f)
+            if version >= LooseVersion('33') and version < LooseVersion('34'):
+                logging.warning(
+                    _('apksigner in build-tools;{version} passes APKs with invalid v3 signatures, ignoring.').format(
+                        version=version
+                    )
+                )
+                continue
+            if version < LooseVersion(MINIMUM_APKSIGNER_BUILD_TOOLS_VERSION):
                 logging.debug("Local Android SDK only has outdated apksigner versions")
                 return
         except TypeError:

{fdroidserver-2.3.4 → fdroidserver-2.3.5}/fdroidserver/verify.py

@@ -80,6 +80,30 @@ def _add_diffoscope_info(d):
         pass
 
 
+def get_verified_json(path):
+    """Get the full collection of reports that is written out to verified.json."""
+    if os.path.exists(path):
+        try:
+            with open(path) as fp:
+                return json.load(fp)
+        except Exception as e:
+            logging.info(f'{path}: {e}')
+
+    data = OrderedDict()
+    data['packages'] = OrderedDict()
+
+    for f in glob.glob(os.path.join(os.path.dirname(path), '*.apk.json')):
+        with open(f) as fp:
+            reports = json.load(fp)
+        for report in reports.values():
+            packageName = report['local']['packageName']
+            if packageName not in data['packages']:
+                data['packages'][packageName] = []
+            data['packages'][packageName].append(report)
+
+    return data
+
+
 def write_json_report(url, remote_apk, unsigned_apk, compare_result):
     """Write out the results of the verify run to JSON.
 
@@ -122,12 +146,7 @@ def write_json_report(url, remote_apk, unsigned_apk, compare_result):
 
     if output['verified']:
         jsonfile = 'unsigned/verified.json'
-        if os.path.exists(jsonfile):
-            with open(jsonfile) as fp:
-                data = json.load(fp)
-        else:
-            data = OrderedDict()
-            data['packages'] = OrderedDict()
+        data = get_verified_json(jsonfile)
         packageName = output['local']['packageName']
 
         if packageName not in data['packages']:

{fdroidserver-2.3.4 → fdroidserver-2.3.5}/fdroidserver.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fdroidserver
-Version: 2.3.4
+Version: 2.3.5
 Summary: F-Droid Server Tools
 Home-page: https://f-droid.org
 Author: The F-Droid Project

{fdroidserver-2.3.4 → fdroidserver-2.3.5}/fdroidserver.egg-info/SOURCES.txt

@@ -35,6 +35,7 @@ buildserver/provision-disable-analytics
 buildserver/provision-gradle
 buildserver/setup-env-vars
 completion/bash-completion
+dev/fdroid_scan-binary.py
 docs/Makefile
 docs/make.bat
 docs/source/conf.py
@@ -181,6 +182,7 @@ tests/org.bitbucket.tickytacky.mirrormirror_2.apk
 tests/org.bitbucket.tickytacky.mirrormirror_3.apk
 tests/org.bitbucket.tickytacky.mirrormirror_4.apk
 tests/org.dyndns.fules.ck_20.apk
+tests/org.fdroid.fdroid_1019051.apk.json
 tests/org.sajeg.fallingblocks_3.apk
 tests/parse-fdroiddata-mirror-config.py
 tests/refresh-SUSS_DEFAULT.py

{fdroidserver-2.3.4 → fdroidserver-2.3.5}/gradlew-fdroid

@@ -207,6 +207,7 @@ get_sha() {
         '8.10.2') echo '31c55713e40233a8303827ceb42ca48a47267a0ad4bab9177123121e71524c26' ;;
         '8.11')   echo '57dafb5c2622c6cc08b993c85b7c06956a2f53536432a30ead46166dbca0f1e9' ;;
         '8.11.1') echo 'f397b287023acdba1e9f6fc5ea72d22dd63669d59ed4a289a29b1a76eee151c6' ;;
+        '8.12')   echo '7a00d51fb93147819aab76024feece20b6b84e420694101f276be952e08bef03' ;;
         *) exit 1
     esac
 }
@@ -227,7 +228,7 @@ d_gradle_plugin_ver_k=(8.4 8.3 8.2 8.1 8.0 7.4 7.3 7.2 7.1 7.0 4.2 4.1 4.0 3.6
 d_plugin_min_gradle_v=(8.6 8.4 8.2 8.0 8.0 7.5 7.4 7.3.3 7.2 7.0.2 6.7.1 6.5 6.1.1 5.6.4 5.4.1 5.1.1 4.10.1 4.6 4.4 4.1 3.3 2.14.1 2.14.1 2.12 2.12 2.4 2.4 2.3 2.2.1 2.2.1 2.1 2.1 1.12 1.12 1.12 1.11 1.10 1.9 1.8 1.6 1.6 1.4 1.4)
 
 # All gradle versions we know about
-plugin_v=(8.11.1 8.11 8.10.2 8.10.1 8.10 8.9 8.8 8.7 8.6 8.5 8.4 8.3 8.2.1 8.2 8.1.1 8.1 8.0.2 8.0.1 8.0 7.6.4 7.6.3 7.6.2 7.6.1 7.6 7.5.1 7.5 7.4.2 7.4.1 7.4 7.3.3 7.3.2 7.3.1 7.3 7.2 7.1.1 7.1 7.0.2 7.0.1 7.0 6.9.4 6.9.3 6.9.2 6.9.1 6.9 6.8.3 6.8.2 6.8.1 6.8 6.7.1 6.7 6.6.1 6.6 6.5.1 6.5 6.4.1 6.4 6.3 6.2.2 6.2.1 6.2 6.1.1 6.1 6.0.1 6.0 5.6.4 5.6.3 5.6.2 5.6.1 5.6 5.5.1 5.5 5.4.1 5.4 5.3.1 5.3 5.2.1 5.2 5.1.1 5.1 5.0 4.10.3 4.10.2 4.10.1 4.10 4.9 4.8.1 4.8 4.7 4.6 4.5.1 4.5 4.4.1 4.4 4.3.1 4.3 4.2.1 4.2 4.1 4.0.2 4.0.1 4.0 3.5.1 3.5 3.4.1 3.4 3.3 3.2.1 3.2 3.1 3.0 2.14.1 2.14 2.13 2.12 2.11 2.10 2.9 2.8 2.7 2.6 2.5 2.4 2.3 2.2.1 2.2 2.1 2.0 1.12 1.11 1.10 1.9 1.8 1.7 1.6 1.5 1.4 1.3 1.2 1.1 1.0 0.9.2 0.9.1 0.9 0.8 0.7)
+plugin_v=(8.12 8.11.1 8.11 8.10.2 8.10.1 8.10 8.9 8.8 8.7 8.6 8.5 8.4 8.3 8.2.1 8.2 8.1.1 8.1 8.0.2 8.0.1 8.0 7.6.4 7.6.3 7.6.2 7.6.1 7.6 7.5.1 7.5 7.4.2 7.4.1 7.4 7.3.3 7.3.2 7.3.1 7.3 7.2 7.1.1 7.1 7.0.2 7.0.1 7.0 6.9.4 6.9.3 6.9.2 6.9.1 6.9 6.8.3 6.8.2 6.8.1 6.8 6.7.1 6.7 6.6.1 6.6 6.5.1 6.5 6.4.1 6.4 6.3 6.2.2 6.2.1 6.2 6.1.1 6.1 6.0.1 6.0 5.6.4 5.6.3 5.6.2 5.6.1 5.6 5.5.1 5.5 5.4.1 5.4 5.3.1 5.3 5.2.1 5.2 5.1.1 5.1 5.0 4.10.3 4.10.2 4.10.1 4.10 4.9 4.8.1 4.8 4.7 4.6 4.5.1 4.5 4.4.1 4.4 4.3.1 4.3 4.2.1 4.2 4.1 4.0.2 4.0.1 4.0 3.5.1 3.5 3.4.1 3.4 3.3 3.2.1 3.2 3.1 3.0 2.14.1 2.14 2.13 2.12 2.11 2.10 2.9 2.8 2.7 2.6 2.5 2.4 2.3 2.2.1 2.2 2.1 2.0 1.12 1.11 1.10 1.9 1.8 1.7 1.6 1.5 1.4 1.3 1.2 1.1 1.0 0.9.2 0.9.1 0.9 0.8 0.7)
 
 v_all=${plugin_v[@]}
 

{fdroidserver-2.3.4 → fdroidserver-2.3.5}/locale/ca/LC_MESSAGES/fdroidserver.po

@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
 # Rubén <rubenx@mail.com>, 2023.
-# pitroig <ona@riseup.net>, 2024.
+# pitroig <ona@riseup.net>, 2024, 2025.
 # raulmagdalena <4omoald1a@mozmail.com>, 2024.
 # Adrià Martín <adriamartinmor@gmail.com>, 2024.
 # unmes <jordi.guiu.pujols@gmail.com>, 2024.
@@ -12,15 +12,15 @@ msgstr ""
 "Project-Id-Version: fdroidserver 2.1-273-g54e84d87\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
 "POT-Creation-Date: 2024-12-11 14:37+0100\n"
-"PO-Revision-Date: 2024-11-27 18:26+0000\n"
-"Last-Translator: Ecron <ecron_89@hotmail.com>\n"
+"PO-Revision-Date: 2025-01-03 17:37+0000\n"
+"Last-Translator: pitroig <ona@riseup.net>\n"
 "Language-Team: Catalan <https://hosted.weblate.org/projects/f-droid/fdroidserver/ca/>\n"
 "Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.9-dev\n"
+"X-Generator: Weblate 5.10-dev\n"
 
 #: ../fdroidserver/nightly.py
 msgid ""
@@ -1514,7 +1514,7 @@ msgstr "Actualitza i cau les regles de l'escàner i les signatures de la xarxa"
 
 #: ../fdroidserver/verify.py
 msgid "Remove source tarball and any APKs if successfully verified."
-msgstr ""
+msgstr "Elimina el fitxer tar d'origen i qualsevol APKs si s'ha verificat correctament."
 
 #: ../fdroidserver/common.py
 msgid "Removing specified files"

{fdroidserver-2.3.4 → fdroidserver-2.3.5}/locale/cs/LC_MESSAGES/fdroidserver.po

@@ -13,7 +13,7 @@ msgstr ""
 "Project-Id-Version: fdroidserver 1.0.0-95-gd7af22b\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
 "POT-Creation-Date: 2024-12-11 14:37+0100\n"
-"PO-Revision-Date: 2024-11-23 18:58+0000\n"
+"PO-Revision-Date: 2024-12-12 01:41+0000\n"
 "Last-Translator: Fjuro <fjuro@alius.cz>\n"
 "Language-Team: Czech <https://hosted.weblate.org/projects/f-droid/fdroidserver/cs/>\n"
 "Language: cs\n"
@@ -1517,7 +1517,7 @@ msgstr "Obnovit a uložit pravidla a podpisy skeneru ze sítě do mezipaměti"
 
 #: ../fdroidserver/verify.py
 msgid "Remove source tarball and any APKs if successfully verified."
-msgstr ""
+msgstr "Odstranit zdrojový tarball a všechny soubory APK při úspěšném ověření."
 
 #: ../fdroidserver/common.py
 msgid "Removing specified files"

{fdroidserver-2.3.4 → fdroidserver-2.3.5}/locale/de/LC_MESSAGES/fdroidserver.po

@@ -15,7 +15,7 @@
 # fossdd <fossdd@tutanota.com>, 2021.
 # Ceeee <marius.romanus@gmx.de>, 2021.
 # C. Rüdinger <Mail-an-CR@web.de>, 2021, 2022.
-# VfBFan <drop0815@posteo.de>, 2021, 2023.
+# VfBFan <drop0815@posteo.de>, 2021, 2023, 2024.
 # Roman Leo <roman.leo@gmx.de>, 2021.
 # Follpvosten <wolfi@karpador.xyz>, 2021.
 # ssantos <ssantos@web.de>, 2022, 2023, 2024.
@@ -27,8 +27,8 @@ msgstr ""
 "Project-Id-Version: fdroidserver 0.9\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
 "POT-Creation-Date: 2024-12-11 14:37+0100\n"
-"PO-Revision-Date: 2024-12-03 09:22+0000\n"
-"Last-Translator: VfBFan <VfBFan@users.noreply.hosted.weblate.org>\n"
+"PO-Revision-Date: 2024-12-12 14:43+0000\n"
+"Last-Translator: VfBFan <drop0815@posteo.de>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/f-droid/fdroidserver/de/>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
@@ -1529,7 +1529,7 @@ msgstr "Aktualisieren und Zwischenspeichern von Scannerregeln und Signaturen aus
 
 #: ../fdroidserver/verify.py
 msgid "Remove source tarball and any APKs if successfully verified."
-msgstr ""
+msgstr "Den Quell-Tarball und alle APKs entfernen, wenn sie erfolgreich verifiziert wurden."
 
 #: ../fdroidserver/common.py
 msgid "Removing specified files"

{fdroidserver-2.3.4 → fdroidserver-2.3.5}/locale/es/LC_MESSAGES/fdroidserver.po

@@ -18,7 +18,7 @@ msgstr ""
 "Project-Id-Version: fdroidserver 0.9\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
 "POT-Creation-Date: 2024-12-11 14:37+0100\n"
-"PO-Revision-Date: 2024-11-21 23:18+0000\n"
+"PO-Revision-Date: 2024-12-20 13:00+0000\n"
 "Last-Translator: gallegonovato <fran-carro@hotmail.es>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/f-droid/fdroidserver/es/>\n"
 "Language: es\n"
@@ -26,7 +26,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.9-dev\n"
+"X-Generator: Weblate 5.9.2-dev\n"
 
 #: ../fdroidserver/nightly.py
 msgid ""
@@ -1520,7 +1520,7 @@ msgstr "Actualización y almacenamiento en caché de las reglas y firmas del esc
 
 #: ../fdroidserver/verify.py
 msgid "Remove source tarball and any APKs if successfully verified."
-msgstr ""
+msgstr "Elimine el archivo tar de origen y todos los APK si se verifican correctamente."
 
 #: ../fdroidserver/common.py
 msgid "Removing specified files"

{fdroidserver-2.3.4 → fdroidserver-2.3.5}/locale/fr/LC_MESSAGES/fdroidserver.po

@@ -40,20 +40,21 @@
 # Sylvain Pichon <service@spichon.fr>, 2024.
 # Sylvain Pichon <Sp_@users.noreply.hosted.weblate.org>, 2024.
 # Lzebulon <lzebulon@crans.org>, 2024.
+# Armand Camponovo <contact@camarm.dev>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: fdroidserver 0.9\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
 "POT-Creation-Date: 2024-12-11 14:37+0100\n"
-"PO-Revision-Date: 2024-11-27 13:22+0000\n"
-"Last-Translator: Ldm Public <ldmpub@gmail.com>\n"
+"PO-Revision-Date: 2024-12-31 00:24+0000\n"
+"Last-Translator: Armand Camponovo <contact@camarm.dev>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/f-droid/fdroidserver/fr/>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 5.9-dev\n"
+"X-Generator: Weblate 5.10-dev\n"
 
 #: ../fdroidserver/nightly.py
 msgid ""
@@ -904,9 +905,8 @@ msgid "Found multiple JAR Signature Block Files in {path}"
 msgstr "Plusieurs fichiers de bloc de signature JAR trouvé à {path}"
 
 #: ../fdroidserver/common.py
-#, fuzzy
 msgid "Found multiple Signer Certificates!"
-msgstr "Plusieurs signataires de certificats ont été trouvés !"
+msgstr "Plusieurs certificats de signatures ont été trouvés !"
 
 #: ../fdroidserver/metadata.py
 #, python-brace-format
@@ -975,7 +975,7 @@ msgstr "Reset de Git échouée"
 #: ../fdroidserver/common.py
 #, fuzzy
 msgid "Git submodule deinit failed"
-msgstr "Échec de la mise à jour du sous-module Git"
+msgstr "Échec de la suppression du sous-module Git"
 
 #: ../fdroidserver/common.py
 msgid "Git submodule sync failed"
@@ -1201,7 +1201,7 @@ msgstr "Lister les fichiers qui seront reformater (test à blanc)"
 
 #: ../fdroidserver/lint.py
 msgid "Locale included in f-droid.org URL"
-msgstr "Les paramètres de lieu sont inclus dans f-droid.org URL"
+msgstr "Les paramètres de localisation sont inclus dans l'URL f-droid.org"
 
 #: ../fdroidserver/build.py
 msgid "Make the build stop on exceptions"
@@ -1328,7 +1328,6 @@ msgid "No unsigned directory - nothing to do"
 msgstr "Aucun dossier non signé — il n'y a rien à faire"
 
 #: ../fdroidserver/__main__.py
-#, fuzzy
 msgid "No version information could be found."
 msgstr "Aucune information sur la version n’a été trouvée."
 
@@ -1459,9 +1458,9 @@ msgid "Print the secret variable to the terminal for easy copy/paste"
 msgstr "Afficher la variable secrète dans le terminal pour un copier/coller facilité"
 
 #: ../fdroidserver/install.py
-#, fuzzy, python-brace-format
+#, python-brace-format
 msgid "Privacy mode was enabled based on your locale ({country_code})."
-msgstr "Le mode de confidentialité a été activé, dû à votre position ({country_code})."
+msgstr "Le mode de confidentialité a été activé, dû à votre localisation ({country_code})."
 
 #: ../fdroidserver/scanner.py
 #, python-format
@@ -1546,7 +1545,6 @@ msgid "Reading {apkfilename} from cache"
 msgstr "Lecture de {apkfilename} à partir du cache"
 
 #: ../fdroidserver/build.py
-#, fuzzy
 msgid "Refresh and cache scanner rules and signatures from the network"
 msgstr "Actualisation et mise en cache des règles et signature à partir du réseau."
 
@@ -1589,9 +1587,9 @@ msgid "Restrict output to warnings and errors"
 msgstr "Limiter la sortie aux avertissements et aux erreurs"
 
 #: ../fdroidserver/net.py
-#, fuzzy, python-format
+#, python-format
 msgid "Retrying failed download: %s"
-msgstr "Réessaie de téléchargement échoué : %s"
+msgstr "Nouvel essai de téléchargement suite à échec : %s"
 
 #: ../fdroidserver/__main__.py
 msgid "Rewrite all the metadata files"
@@ -1818,7 +1816,6 @@ msgid "These are the apps that have been archived from the main repo."
 msgstr "Voici les applications qui ont été archivées à partir du dépôt principal."
 
 #: ../fdroidserver/mirror.py
-#, fuzzy
 msgid "This command should never be used to mirror f-droid.org! A full copy requires more than 600GB."
 msgstr "Cette commande ne devrait jamais être utilisée pour copier f-droid.org ! Une copie occupe plus de 600GB."
 

{fdroidserver-2.3.4 → fdroidserver-2.3.5}/locale/ga/LC_MESSAGES/fdroidserver.po

@@ -6,7 +6,7 @@ msgstr ""
 "Project-Id-Version: fdroidserver 2.3a1-162-gfbb3cc59\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
 "POT-Creation-Date: 2024-12-11 14:37+0100\n"
-"PO-Revision-Date: 2024-11-22 21:03+0000\n"
+"PO-Revision-Date: 2024-12-14 19:00+0000\n"
 "Last-Translator: Aindriú Mac Giolla Eoin <aindriu80@gmail.com>\n"
 "Language-Team: Irish <https://hosted.weblate.org/projects/f-droid/fdroidserver/ga/>\n"
 "Language: ga\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=5; plural=n==1 ? 0 : n==2 ? 1 : (n>2 && n<7) ? 2 :(n>6 && n<11) ? 3 : 4;\n"
-"X-Generator: Weblate 5.9-dev\n"
+"X-Generator: Weblate 5.9-rc\n"
 
 #: ../fdroidserver/nightly.py
 msgid ""
@@ -1514,7 +1514,7 @@ msgstr "Athnuaigh agus cuir rialacha agus sínithe scanóirí taisce ón líonra
 
 #: ../fdroidserver/verify.py
 msgid "Remove source tarball and any APKs if successfully verified."
-msgstr ""
+msgstr "Bain tarball foinse agus aon APKanna má fhíoraítear go rathúil é."
 
 #: ../fdroidserver/common.py
 msgid "Removing specified files"

{fdroidserver-2.3.4 → fdroidserver-2.3.5}/locale/ja/LC_MESSAGES/fdroidserver.po

@@ -3,13 +3,14 @@
 # Hinaloe <hina@hinaloe.net>, 2020.
 # Suguru Hirahara <shirahara@users.noreply.hosted.weblate.org>, 2024.
 # "Shuuji TAKAHASHI (shuuji3)" <shuuji3@gmail.com>, 2024.
+# Liner Seven <linour7gmekiblo@gmail.com>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: fdroidserver 0.8-224-g4b0ade7\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
 "POT-Creation-Date: 2024-12-11 14:37+0100\n"
-"PO-Revision-Date: 2024-11-28 08:34+0000\n"
-"Last-Translator: \"Shuuji TAKAHASHI (shuuji3)\" <shuuji3@gmail.com>\n"
+"PO-Revision-Date: 2024-12-12 01:41+0000\n"
+"Last-Translator: Liner Seven <linour7gmekiblo@gmail.com>\n"
 "Language-Team: Japanese <https://hosted.weblate.org/projects/f-droid/fdroidserver/ja/>\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
@@ -1508,7 +1509,7 @@ msgstr "スキャナーのルールと署名をネットワークから取得し
 
 #: ../fdroidserver/verify.py
 msgid "Remove source tarball and any APKs if successfully verified."
-msgstr ""
+msgstr "検証成功時にソースのTAR・APKを削除する。"
 
 #: ../fdroidserver/common.py
 msgid "Removing specified files"

{fdroidserver-2.3.4 → fdroidserver-2.3.5}/locale/pick-complete-translations.py

@@ -2,6 +2,7 @@
 #
 # add completed translations from weblate to MANIFEST.in
 
+import git
 import json
 import os
 import re
@@ -37,14 +38,41 @@ for locale in sorted(data, key=lambda locale: locale['code']):
 
 manifest_file = os.path.join(projectbasedir, 'MANIFEST.in')
 with open(manifest_file) as fp:
-    for line in fp.readlines():
-        m = re.match(r'include locale/([^/]+)/.*', line)
-        if m:
-            active.add(m.group(1))
+    manifest_in = fp.read()
+for m in re.findall(r'include locale/([^/]+)/LC_MESSAGES/fdroidserver.po', manifest_in):
+    active.add(m)
 
+repo = git.Repo(projectbasedir)
+weblate = repo.remotes.weblate
+weblate.fetch()
+upstream = repo.remotes.upstream
+upstream.fetch()
+
+if 'merge_weblate' in repo.heads:
+    merge_weblate = repo.heads['merge_weblate']
+    repo.create_tag(
+        'previous_merge_weblate',
+        ref=merge_weblate,
+        message=('Automatically created by %s' % __file__),
+    )
+else:
+    merge_weblate = repo.create_head('merge_weblate')
+merge_weblate.set_commit(upstream.refs.master)
+merge_weblate.checkout()
+
+active = sorted(active)
 manifest_lines = set()
 for locale in active:
-    manifest_lines.add('include locale/%s/LC_MESSAGES/fdroidserver.po\n' % locale)
+    po_file = f'locale/{locale}/LC_MESSAGES/fdroidserver.po'
+    manifest_lines.add(f'include {po_file}\n')
+    for commit in repo.iter_commits(
+        str(weblate.refs.master) + '...' + str(upstream.refs.master),
+        paths=[po_file],
+        max_count=10,
+        reverse=True,
+    ):
+        print(f'{locale}: git cherry-pick', commit)
+        repo.git.cherry_pick(commit)
 
 with open(manifest_file, 'a') as fp:
     for line in manifest_lines:
@@ -52,3 +80,10 @@ with open(manifest_file, 'a') as fp:
             fp.write(line)
 
 subprocess.run(['sort', '-u', '-o', manifest_file, manifest_file])
+
+print('\tIf all else fails, try:')
+print('\tgit checkout -B merge_weblate weblate/master')
+print('\tgit rebase -i upstream/master')
+print('\t# select all in editor and cut all commit lines')
+print('\twl-paste | grep -Eo ".* \((%s)\) .*" | wl-copy' % '|'.join(active))
+print('\t# paste into editor, and make rebase\n')

{fdroidserver-2.3.4 → fdroidserver-2.3.5}/locale/pt_BR/LC_MESSAGES/fdroidserver.po

@@ -19,15 +19,15 @@ msgstr ""
 "Project-Id-Version: fdroidserver 0.9\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
 "POT-Creation-Date: 2024-12-11 14:37+0100\n"
-"PO-Revision-Date: 2024-11-25 13:28+0000\n"
-"Last-Translator: dedakir923 <dedakir923@exoular.com>\n"
+"PO-Revision-Date: 2024-12-24 01:00+0000\n"
+"Last-Translator: LucasMZ <git@lucasmz.dev>\n"
 "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/f-droid/fdroidserver/pt_BR/>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 5.9-dev\n"
+"X-Generator: Weblate 5.10-dev\n"
 
 #: ../fdroidserver/nightly.py
 msgid ""
@@ -1521,7 +1521,7 @@ msgstr "Atualizar e armazenar em cache regras e assinaturas do scanner da rede"
 
 #: ../fdroidserver/verify.py
 msgid "Remove source tarball and any APKs if successfully verified."
-msgstr ""
+msgstr "Remover pacote de código-fonte e qualquer APK se verificado com sucesso."
 
 #: ../fdroidserver/common.py
 msgid "Removing specified files"

{fdroidserver-2.3.4 → fdroidserver-2.3.5}/locale/pt_PT/LC_MESSAGES/fdroidserver.po

@@ -2,7 +2,7 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # Manuela Silva <mmsrs@sky.com>, 2020.
-# ssantos <ssantos@web.de>, 2020, 2021, 2022, 2023, 2024.
+# ssantos <ssantos@web.de>, 2020, 2021, 2022, 2023, 2024, 2025.
 # Hans-Christoph Steiner <hans@guardianproject.info>, 2020, 2022, 2024.
 # Peter J. Mello <admin@petermello.net>, 2021.
 # Fat Potato <mjwany48@gmail.com>, 2024.
@@ -12,15 +12,15 @@ msgstr ""
 "Project-Id-Version: fdroidserver 0.9\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/fdroid/fdroidserver/issues\n"
 "POT-Creation-Date: 2024-12-11 14:37+0100\n"
-"PO-Revision-Date: 2024-11-26 10:54+0000\n"
-"Last-Translator: Hugo Carvalho <hugokarvalho@hotmail.com>\n"
+"PO-Revision-Date: 2025-01-03 06:49+0000\n"
+"Last-Translator: ssantos <ssantos@web.de>\n"
 "Language-Team: Portuguese (Portugal) <https://hosted.weblate.org/projects/f-droid/fdroidserver/pt_PT/>\n"
 "Language: pt_PT\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 5.9-dev\n"
+"X-Generator: Weblate 5.10-dev\n"
 
 #: ../fdroidserver/nightly.py
 msgid ""
@@ -1514,7 +1514,7 @@ msgstr "Atualizar e armazenar as regras e assinaturas do scanner da rede no cach
 
 #: ../fdroidserver/verify.py
 msgid "Remove source tarball and any APKs if successfully verified."
-msgstr ""
+msgstr "Remover tarball de código-fonte e todos APKs se for verificado com sucesso."
 
 #: ../fdroidserver/common.py
 msgid "Removing specified files"