PyPI - fdroidserver - Versions diffs - 2.3a1__tar.gz → 2.3.1__tar.gz - Mend

fdroidserver 2.3a1tar.gz → 2.3.1tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (984) hide show

{fdroidserver-2.3a1 → fdroidserver-2.3.1}/CHANGELOG.md RENAMED Viewed

@@ -12,8 +12,79 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 ### Removed
+## [2.3.1] - 2024-11-25
+### Fixed
+* Sync all translations for: cs de es fr ga pt_BR ru sq zh_Hans.
+* Drop use of deprecated imghdr library to support Python 3.13.
+* Install biplist and pycountry by default on macOS.
+* Fixed running test suite out of dist tarball.
+## [2.3.0] - 2024-11-21
+### Added
+* YAML 1.2 as native format for all _.yml_ files, including metadata and config.
+* install: will now fetch _F-Droid.apk_ and install it via `adb`.
+  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1546
+* scanner: scan APK Signing Block for known block types like Google Play
+  Signature aka "Frosting".
+  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1555
+* Support Rclone for deploying to many different cloud services.
+* deploy: support deploying to GitHub Releases.
+  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1471
+* scanner: support libs.versions.toml
+  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1526
+* Consider subdir for triple-t metadata discovery in Flutter apps.
+  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1541
+* deploy: added `index_only:` mode for mirroring the index to small hosting
+  locations. https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1420
+* Support publishing repos in AltStore format.
+  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1465
+* Support indexing iOS IPA app files.
+  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1413
+* deploy: _config/mirrors.yml_ file with support for adding per-mirror metadata,
+  like `countryCode:`.
+* Repo's categories are now set in the config files.
+* lint: check syntax of config files.
+* publish: ``--error-on-failed` to exit when signing/verifying fails.
+* scanner: `--refresh` and `refresh_config:` to control triggering a refresh of
+  the rule sets.
+* Terminal output colorization and `--color` argument to control it.
+* New languages: Catalan (ca), Irish (ga), Japanese (ja), Serbian (sr), and
+  Swahili (sw).
+* Support donation links from `community_bridge`, `buy_me_a_coffee`.
+### Fixed
+* Use last modified time and file size for caching data about scanned APKs
+  instead of SHA-256 checksum.
+  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1542
+* `repo_web_base_url:` config for generating per-app URLs for viewing in
+  browsers.  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1178
+* `fdroid scanner` flags WebAssembly binary _.wasm_ files.
+  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1562
+* Test suite as standard Python `unittest` setup (thanks @ghost.adh).
+* scanner: error on dependency files without lock file.
+  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1504
+* nightly: finding APKs in the wrong directory. (thanks @WrenIX)
+  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1512
+* `AllowedAPKSigningKeys` works with all single-signer APK signatures.
+  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1466
+* Sync all translations for: cs de it ko pl pt pt_BR pt_PT ro ru sq tr uk
+  zh_Hans zh_Hant.
+* Support Androguard 4.x.
+* Support Python 3.12.
+### Removed
+* Drop all uses of _stats/known_apks.txt_ and the `update_stats:` config key.
+  https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1547
 * The `maven:` field is now always a string, with `yes` as a legacy special
   value.  It is no longer treated like a boolean in any case.
+* scanner: jcenter is no longer an allowed Maven repo.
+* build: `--reset-server` removed (thanks @gotmi1k).
 ## [2.2.2] - 2024-04-24

{fdroidserver-2.3a1 → fdroidserver-2.3.1}/MANIFEST.in RENAMED Viewed

@@ -21,12 +21,15 @@ include examples/Vagrantfile.yaml
 include gradlew-fdroid
 include LICENSE
 include locale/bo/LC_MESSAGES/fdroidserver.po
+include locale/ca/LC_MESSAGES/fdroidserver.po
 include locale/cs/LC_MESSAGES/fdroidserver.po
 include locale/de/LC_MESSAGES/fdroidserver.po
 include locale/es/LC_MESSAGES/fdroidserver.po
 include locale/fr/LC_MESSAGES/fdroidserver.po
+include locale/ga/LC_MESSAGES/fdroidserver.po
 include locale/hu/LC_MESSAGES/fdroidserver.po
 include locale/it/LC_MESSAGES/fdroidserver.po
+include locale/ja/LC_MESSAGES/fdroidserver.po
 include locale/ko/LC_MESSAGES/fdroidserver.po
 include locale/nb_NO/LC_MESSAGES/fdroidserver.po
 include locale/pl/LC_MESSAGES/fdroidserver.po
@@ -36,16 +39,18 @@ include locale/pt_PT/LC_MESSAGES/fdroidserver.po
 include locale/ro/LC_MESSAGES/fdroidserver.po
 include locale/ru/LC_MESSAGES/fdroidserver.po
 include locale/sq/LC_MESSAGES/fdroidserver.po
+include locale/sr/LC_MESSAGES/fdroidserver.po
+include locale/sw/LC_MESSAGES/fdroidserver.po
 include locale/tr/LC_MESSAGES/fdroidserver.po
 include locale/uk/LC_MESSAGES/fdroidserver.po
 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
-include tests/build.TestCase
 include tests/build-tools/17.0.0/aapt-output-com.moez.QKSMS_182.txt
 include tests/build-tools/17.0.0/aapt-output-com.politedroid_3.txt
 include tests/build-tools/17.0.0/aapt-output-com.politedroid_4.txt
@@ -542,9 +547,7 @@ include tests/build-tools/28.0.3/aapt-output-obb.main.twoversions_1101617.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
-include tests/checkupdates.TestCase
 include tests/com.fake.IpaApp_1000000000001.ipa
-include tests/common.TestCase
 include tests/config.py
 include tests/config/antiFeatures.yml
 include tests/config/categories.yml
@@ -564,10 +567,8 @@ include tests/config/ic_antifeature_upstreamnonfree.xml
 include tests/config/ro/antiFeatures.yml
 include tests/config/zh-rCN/antiFeatures.yml
 include tests/corrupt-featureGraphic.png
-include tests/deploy.TestCase
 include tests/dummy-keystore.jks
 include tests/dump_internal_metadata_format.py
-include tests/exception.TestCase
 include tests/extra/manual-vmtools-test.py
 include tests/funding-usernames.yaml
 include tests/get_android_tools_versions/android-ndk-r10e/RELEASE.TXT
@@ -586,10 +587,6 @@ include tests/gnupghome/secring.gpg
 include tests/gnupghome/trustdb.gpg
 include tests/gradle-maven-blocks.yaml
 include tests/gradle-release-checksums.py
-include tests/import_subcommand.TestCase
-include tests/index.TestCase
-include tests/init.TestCase
-include tests/install.TestCase
 include tests/IsMD5Disabled.java
 include tests/issue-1128-min-sdk-30-poc.apk
 include tests/issue-1128-poc1.apk
@@ -599,8 +596,6 @@ include tests/issue-1128-poc3b.apk
 include tests/janus.apk
 include tests/keystore.jks
 include tests/key-tricks.py
-include tests/lint.TestCase
-include tests/main.TestCase
 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
@@ -655,9 +650,7 @@ 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/metadata.TestCase
 include tests/minimal_targetsdk_30_unsigned.apk
-include tests/nightly.TestCase
 include tests/Norway_bouvet_europe_2.obf.zip
 include tests/no_targetsdk_minsdk1_unsigned.apk
 include tests/no_targetsdk_minsdk30_unsigned.apk
@@ -668,7 +661,6 @@ include tests/org.bitbucket.tickytacky.mirrormirror_3.apk
 include tests/org.bitbucket.tickytacky.mirrormirror_4.apk
 include tests/org.dyndns.fules.ck_20.apk
 include tests/org.sajeg.fallingblocks_3.apk
-include tests/publish.TestCase
 include tests/repo/com.example.test.helloworld_1.apk
 include tests/repo/com.politedroid_3.apk
 include tests/repo/com.politedroid_4.apk
@@ -726,18 +718,24 @@ include tests/repo/patch.1619.obb.mainpatch.current.obb
 include tests/repo/souch.smsbypass_9.apk
 include tests/repo/urzip-*.apk
 include tests/repo/v1.v2.sig_1020.apk
-include tests/rewritemeta.TestCase
 include tests/run-tests
 include tests/SANAPPSI.RSA
 include tests/SANAPPSI.SF
-include tests/scanner.TestCase
-include tests/signatures.TestCase
-include tests/signindex.TestCase
 include tests/signindex/guardianproject.jar
 include tests/signindex/guardianproject-v1.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/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/settings.gradle.kts
 include tests/source-files/cn.wildfirechat.chat/avenginekit/build.gradle
 include tests/source-files/cn.wildfirechat.chat/build.gradle
 include tests/source-files/cn.wildfirechat.chat/chat/build.gradle
@@ -754,6 +752,8 @@ include tests/source-files/com.anpmech.launcher/app/src/main/AndroidManifest.xml
 include tests/source-files/com.anpmech.launcher/build.gradle
 include tests/source-files/com.anpmech.launcher/settings.gradle
 include tests/source-files/com.github.jameshnsears.quoteunquote/build.gradle
+include tests/source-files/com.github.shadowsocks/core/build.gradle.kts
+include tests/source-files/com.github.shadowsocks/mobile/build.gradle.kts
 include tests/source-files/com.integreight.onesheeld/build.gradle
 include tests/source-files/com.integreight.onesheeld/gradle/wrapper/gradle-wrapper.properties
 include tests/source-files/com.integreight.onesheeld/localeapi/build.gradle
@@ -770,6 +770,11 @@ 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.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
@@ -797,12 +802,24 @@ include tests/source-files/firebase-allowlisted/build.gradle
 include tests/source-files/firebase-suspect/app/build.gradle
 include tests/source-files/firebase-suspect/build.gradle
 include tests/source-files/info.guardianproject.ripple/build.gradle
+include tests/source-files/lockfile.test/flutter/.dart_tool/flutter_gen/pubspec.yaml
+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/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
 include tests/source-files/org.noise_planet.noisecapture/app/build.gradle
 include tests/source-files/org.noise_planet.noisecapture/settings.gradle
 include tests/source-files/org.noise_planet.noisecapture/sosfilter/build.gradle
+include tests/source-files/org.piepmeyer.gauguin/build.gradle.kts
+include tests/source-files/org.piepmeyer.gauguin/libs.versions.toml
+include tests/source-files/org.piepmeyer.gauguin/settings.gradle.kts
 include tests/source-files/org.tasks/app/build.gradle.kts
 include tests/source-files/org.tasks/build.gradle
 include tests/source-files/org.tasks/build.gradle.kts
@@ -810,6 +827,7 @@ include tests/source-files/org.tasks/buildSrc/build.gradle.kts
 include tests/source-files/org.tasks/settings.gradle.kts
 include tests/source-files/osmandapp/osmand/build.gradle
 include tests/source-files/osmandapp/osmand/gradle/wrapper/gradle-wrapper.properties
+include tests/source-files/OtakuWorld/build.gradle
 include tests/source-files/realm/react-native/android/build.gradle
 include tests/source-files/se.manyver/android/app/build.gradle
 include tests/source-files/se.manyver/android/build.gradle
@@ -827,9 +845,28 @@ include tests/source-files/ut.ewh.audiometrytest/settings.gradle
 include tests/source-files/yuriykulikov/AlarmClock/gradle/wrapper/gradle-wrapper.properties
 include tests/source-files/Zillode/syncthing-silk/build.gradle
 include tests/SpeedoMeterApp.main_1.apk
-include tests/stats/known_apks.txt
 include tests/testcommon.py
-include tests/test-gradlew-fdroid
+include tests/test_build.py
+include tests/test_checkupdates.py
+include tests/test_common.py
+include tests/test_deploy.py
+include tests/test_exception.py
+include tests/test_gradlew-fdroid
+include tests/test_import_subcommand.py
+include tests/test_index.py
+include tests/test_init.py
+include tests/test_install.py
+include tests/test_lint.py
+include tests/test_main.py
+include tests/test_metadata.py
+include tests/test_nightly.py
+include tests/test_publish.py
+include tests/test_rewritemeta.py
+include tests/test_scanner.py
+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/src/debug/res/values/constants.xml
@@ -886,7 +923,6 @@ 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/update.TestCase
 include tests/urzip.apk
 include tests/urzip-badcert.apk
 include tests/urzip-badsig.apk
@@ -896,4 +932,3 @@ 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/vcs.TestCase

{fdroidserver-2.3a1/fdroidserver.egg-info → fdroidserver-2.3.1}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fdroidserver
-Version: 2.3a1
+Version: 2.3.1
 Summary: F-Droid Server Tools
 Home-page: https://f-droid.org
 Author: The F-Droid Project
@@ -59,19 +59,32 @@ package managers.  All of the options are documented on the website:
 https://f-droid.org/docs/Installing_the_Server_and_Repo_Tools
+## Releases
+The production setup of _fdroidserver_ for f-droid.org is run directly from the
+_master_ branch.  This is put into production on an schedule (currently weekly).
+So development and testing happens in the branches. We track branches using
+merge requests.  Therefore, there are many WIP and long-lived merge requests.
+There are also stable releases of _fdroidserver_.  This is mostly intended for
+running custom repositories, where the build process is separate.  It can also
+be useful as a simple way to get started contributing packages to _fdroiddata_,
+since the stable releases are available in package managers.
 ## Tests
 To run the full test suite:
     tests/run-tests
-To run the tests for individual Python modules, see the _.TestCase_ files, e.g.:
+To run the tests for individual Python modules, see the `tests/test_*.py` files, e.g.:
-    tests/metadata.TestCase
+    python -m unittest tests/test_metadata.py
 It is also possible to run individual tests:
-    tests/metadata.TestCase MetadataTest.test_rewrite_yaml_special_build_params
+    python -m unittest tests.test_metadata.MetadataTest.test_rewrite_yaml_special_build_params
 There is a growing test suite that has good coverage on a number of key parts of
 this code base.  It does not yet cover all the code, and there are some parts
@@ -100,14 +113,6 @@ locally](https://docs.gitlab.com/runner/commands/README.html#gitlab-runner-exec)
 like this: `gitlab-runner exec docker ubuntu_lts`
-### Buildserver
-The tests for the whole build server setup are entirely separate
-because they require at least 200 GB of disk space, and 8 GB of
-RAM. These test scripts are in the root of the project, all starting
-with _jenkins-_ since they used to be run on https://jenkins.debian.net.
 ## Documentation
 The API documentation based on the docstrings gets automatically

{fdroidserver-2.3a1 → fdroidserver-2.3.1}/README.md RENAMED Viewed

@@ -34,19 +34,32 @@ package managers.  All of the options are documented on the website:
 https://f-droid.org/docs/Installing_the_Server_and_Repo_Tools
+## Releases
+The production setup of _fdroidserver_ for f-droid.org is run directly from the
+_master_ branch.  This is put into production on an schedule (currently weekly).
+So development and testing happens in the branches. We track branches using
+merge requests.  Therefore, there are many WIP and long-lived merge requests.
+There are also stable releases of _fdroidserver_.  This is mostly intended for
+running custom repositories, where the build process is separate.  It can also
+be useful as a simple way to get started contributing packages to _fdroiddata_,
+since the stable releases are available in package managers.
 ## Tests
 To run the full test suite:
     tests/run-tests
-To run the tests for individual Python modules, see the _.TestCase_ files, e.g.:
+To run the tests for individual Python modules, see the `tests/test_*.py` files, e.g.:
-    tests/metadata.TestCase
+    python -m unittest tests/test_metadata.py
 It is also possible to run individual tests:
-    tests/metadata.TestCase MetadataTest.test_rewrite_yaml_special_build_params
+    python -m unittest tests.test_metadata.MetadataTest.test_rewrite_yaml_special_build_params
 There is a growing test suite that has good coverage on a number of key parts of
 this code base.  It does not yet cover all the code, and there are some parts
@@ -75,14 +88,6 @@ locally](https://docs.gitlab.com/runner/commands/README.html#gitlab-runner-exec)
 like this: `gitlab-runner exec docker ubuntu_lts`
-### Buildserver
-The tests for the whole build server setup are entirely separate
-because they require at least 200 GB of disk space, and 8 GB of
-RAM. These test scripts are in the root of the project, all starting
-with _jenkins-_ since they used to be run on https://jenkins.debian.net.
 ## Documentation
 The API documentation based on the docstrings gets automatically

{fdroidserver-2.3a1 → fdroidserver-2.3.1}/buildserver/Vagrantfile RENAMED Viewed

@@ -14,7 +14,7 @@ configfile = {
 srvpath = Pathname.new(File.dirname(__FILE__)).realpath
 configpath = File.join(srvpath, "/Vagrantfile.yaml")
-if File.exists? configpath
+if File.exist? configpath
   c = YAML.load_file(configpath)
   if c and not c.empty?
     c.each do |k,v|
@@ -86,7 +86,7 @@ Vagrant.configure("2") do |config|
   # Make sure dir exists to mount to, since buildserver/ is
   # automatically mounted as /vagrant in the guest VM. This is more
   # necessary with 9p synced folders
-  Dir.mkdir('cache') unless File.exists?('cache')
+  Dir.mkdir('cache') unless File.exist?('cache')
   # Root partition needs to be resized to the new allocated space
   config.vm.provision "shell", inline: <<-SHELL

{fdroidserver-2.3a1 → fdroidserver-2.3.1}/buildserver/provision-apt-get-install RENAMED Viewed

@@ -116,7 +116,7 @@ packages="
  patch
  python3-packaging
  rsync
- sdkmanager
+ sdkmanager/bookworm-backports
  sudo
  unzip
 "

{fdroidserver-2.3a1 → fdroidserver-2.3.1}/buildserver/provision-gradle RENAMED Viewed

@@ -26,8 +26,8 @@ chmod -R a+rX /opt/gradle
 test -e /opt/gradle/bin || mkdir -p /opt/gradle/bin
 ln -fs /home/vagrant/fdroidserver/gradlew-fdroid /opt/gradle/bin/gradle
-chown -h vagrant.vagrant /opt/gradle/bin/gradle
-chown vagrant.vagrant /opt/gradle/versions
+chown -h vagrant:vagrant /opt/gradle/bin/gradle
+chown vagrant:vagrant /opt/gradle/versions
 chmod 0755 /opt/gradle/versions
 GRADLE_HOME=/home/vagrant/.gradle
@@ -44,5 +44,5 @@ systemProp.org.gradle.internal.http.connectionTimeout=600000
 systemProp.org.gradle.internal.http.socketTimeout=600000
 EOF
-chown -R vagrant.vagrant $GRADLE_HOME/
+chown -R vagrant:vagrant $GRADLE_HOME/
 chmod -R a+rX $GRADLE_HOME/

{fdroidserver-2.3a1 → fdroidserver-2.3.1}/completion/bash-completion RENAMED Viewed

@@ -83,7 +83,7 @@ __complete_options() {
 __complete_build() {
 	opts="-v -q -l -s -t -f -a"
-	lopts="--verbose --quiet --latest --stop --test --server --reset-server --skip-scan --scan-binary --no-tarball --force --all --no-refresh"
+	lopts="--verbose --quiet --latest --stop --test --server --skip-scan --scan-binary --no-tarball --force --all --no-refresh"
 	case "${prev}" in
 		:)
 			__vercode
@@ -109,8 +109,8 @@ __complete_gpgsign() {
 }
 __complete_install() {
-	opts="-v -q"
-	lopts="--verbose --quiet --all"
+	opts="-v -q -a -p -n -y"
+	lopts="--verbose --quiet --all --color --no-color --privacy-mode --no-privacy-mode --no --yes"
 	case "${cur}" in
 		-*)
 			__complete_options
@@ -251,7 +251,7 @@ __complete_btlog() {
 __complete_mirror() {
 	opts="-v"
-	lopts="--all --archive --build-logs --pgp-signatures --src-tarballs --output-dir"
+	lopts="--all --archive --build-logs --color --no-color --pgp-signatures --src-tarballs --output-dir"
 	__complete_options
 }
@@ -270,7 +270,7 @@ __complete_deploy() {
 __complete_signatures() {
 	opts="-v -q"
-	lopts="--verbose --no-check-https"
+	lopts="--verbose --color --no-color --no-check-https"
 	case "${cur}" in
 		-*)
 			__complete_options
@@ -289,7 +289,7 @@ __complete_signindex() {
 __complete_init() {
 	opts="-v -q -d"
 	lopts="--verbose --quiet --distinguished-name --keystore
- --repo-keyalias --android-home --no-prompt"
+ --repo-keyalias --android-home --no-prompt --color --no-color"
 	__complete_options
 }

{fdroidserver-2.3a1 → fdroidserver-2.3.1}/examples/config.yml RENAMED Viewed

@@ -51,6 +51,13 @@
 # Canonical URL of the repositoy, needs to end in /repo. Is is used to identity
 # the repo in the client, as well.
 # repo_url: https://MyFirstFDroidRepo.org/fdroid/repo
+#
+# Base URL for per-package pages on the website of this repo,
+# i.e. https://f-droid.org/packages/<appid>/ This should be accessible
+# with a browser. Setting it to null or not setting this disables the
+# feature.
+# repo_web_base_url: https://MyFirstFDroidRepo.org/packages/
+#
 # repo_name: My First F-Droid Repo Demo
 # repo_description: >-
 #   This is a repository of apps to be used with F-Droid. Applications
@@ -62,6 +69,7 @@
 # As above, but for the archive repo.
 #
 # archive_url: https://f-droid.org/archive
+# archive_web_base_url:
 # archive_name: My First F-Droid Archive Demo
 # archive_description: >-
 #   The repository of older versions of packages from the main demo repository.
@@ -183,7 +191,7 @@
 #
 # serverwebroot:
 #   - url: 'me@b.az:/srv/fdroid'
-#     indexOnly: true
+#     index_only: true
 # When running fdroid processes on a remote server, it is possible to
@@ -209,7 +217,38 @@
 # servergitmirrors:
 #   - url: https://github.com/user/repo
 #   - url: https://gitlab.com/user/repo
-#     indexOnly: true
+#     index_only: true
+# These settings allow using `fdroid deploy` for publishing APK files from
+# your repository to GitHub Releases. (You should also run `fdroid update`
+# every time before deploying to GitHub releases to update index files.) Here's
+# an example for this deployment automation:
+# https://github.com/f-droid/fdroidclient/releases/
+#
+# Currently, versions which are assigned to a release channel (e.g. alpha or
+# beta releases) are ignored.
+#
+# In the example below, tokens are read from environment variables. Putting
+# tokens directly into the config file is also supported but discouraged. It is
+# highly recommended to use a "Fine-grained personal access token", which is
+# restricted to the minimum required permissions, which are:
+#  * Metadata - read
+#  * Contents - read/write
+# (https://github.com/settings/personal-access-tokens/new)
+#
+# github_token: {env: GITHUB_TOKEN}
+# github_releases:
+#   - projectUrl: https://github.com/f-droid/fdroidclient
+#     packageNames:
+#       - org.fdroid.basic
+#       - org.fdroid.fdroid
+#     release_notes_prepend: |
+#       Re-post of official F-Droid App release from https://f-droid.org
+#   - projectUrl: https://github.com/example/app
+#     packageNames: com.example.app
+#     token: {env: GITHUB_TOKEN_EXAMPLE}
 # Most git hosting services have hard size limits for each git repo.
 # `fdroid deploy` will delete the git history when the git mirror repo
@@ -267,10 +306,20 @@
 # sync_from_local_copy_dir: true
-# To upload the repo to an Amazon S3 bucket using `fdroid server
-# update`.  Warning, this deletes and recreates the whole fdroid/
-# directory each time. This prefers s3cmd, but can also use
-# apache-libcloud.  To customize how s3cmd interacts with the cloud
+# To upload the repo to an Amazon S3 bucket using `fdroid deploy'
+# . rclone, s3cmd and apache libcloud are the available options.
+# If rclone and s3cmd are not installed, apache libcloud is used.
+# To use apache libcloud, add the following options to this file
+# (config.yml)
+#
+# awsbucket: myawsfdroid
+# awsaccesskeyid: SEE0CHAITHEIMAUR2USA
+# awssecretkey: {env: awssecretkey}
+#
+# In case s3cmd is installed and rclone is not installed,
+# s3cmd will be the preferred sync option.
+# It will delete and recreate the whole fdroid directory each time.
+# To customize how s3cmd interacts with the cloud
 # provider, create a 's3cfg' file next to this file (config.yml), and
 # those settings will be used instead of any 'aws' variable below.
 # Secrets can be fetched from environment variables to ensure that
@@ -279,6 +328,47 @@
 # awsbucket: myawsfdroid
 # awsaccesskeyid: SEE0CHAITHEIMAUR2USA
 # awssecretkey: {env: awssecretkey}
+#
+# In case rclone is installed and s3cmd is not installed,
+# rclone will be the preferred sync option.
+# It will sync the local folders with remote folders without
+# deleting anything in one go.
+# To ensure success, install rclone as per
+# the instructions at https://rclone.org/install/ and also configure for
+# object storage services as detailed at https://rclone.org/s3/#configuration
+# By default rclone uses the configuration file at ~/.config/rclone/rclone.conf
+# To specify a custom configuration file, please add the full path to the
+# configuration file as below
+#
+# path_to_custom_rclone_config: /home/mycomputer/somedir/example.conf
+#
+# This setting will ignore the default rclone config found at
+# ~/.config/rclone/rclone.conf
+#
+# Please note that rclone_config can be assigned a string or list
+#
+# awsbucket: myawsfdroid
+# rclone_config: aws-sample-config
+#
+# or
+#
+# awsbucket: myawsfdroid
+# rclone_config: [aws-sample-config, rclone-supported-service-config]
+#
+# In case both rclone and s3cmd are installed, the preferred sync
+# tool can be specified in this file (config.yml)
+# if s3cmd is preferred, set it as below
+#
+# s3cmd: true
+#
+# if rclone is preferred, set it as below
+#
+# rclone: true
+#
+# Please note that only one can be set to true at any time
+# Also, in the event that both s3cmd and rclone are installed
+# and both are missing from the config.yml file, the preferred
+# tool will be s3cmd.
 # If you want to force 'fdroid server' to use a non-standard serverwebroot.
@@ -311,11 +401,6 @@
 # configured to allow push access (e.g. ssh key, username/password, etc)
 # binary_transparency_remote: git@gitlab.com:fdroid/binary-transparency-log.git
-# If you want to keep the "added" and "last updated" dates for each
-# app and APK in your repo, enable this.  The name comes from an old
-# system for tracking statistics that is no longer included.
-# update_stats: true
 # Set this to true to always use a build server. This saves specifying the
 # --server option on dedicated secure build server hosts.
 # build_server_always: true

{fdroidserver-2.3a1 → fdroidserver-2.3.1}/examples/fdroid_fetchsrclibs.py RENAMED Viewed

@@ -19,9 +19,7 @@ def main():
     parser.add_argument("appid", nargs='*', help=_("applicationId with optional versionCode in the form APPID[:VERCODE]"))
     metadata.add_metadata_arguments(parser)
     options = common.parse_args(parser)
-    pkgs = common.read_pkg_args(options.appid, True)
-    allapps = metadata.read_metadata(pkgs)
-    apps = common.read_app_args(options.appid, allapps, True)
+    apps = common.read_app_args(options.appid, allow_version_codes=True, sort_by_time=True)
     common.read_config()
     srclib_dir = os.path.join('build', 'srclib')
     os.makedirs(srclib_dir, exist_ok=True)

fdroidserver 2.3a1__tar.gz → 2.3.1__tar.gz

fdroidserver 2.3a1tar.gz → 2.3.1tar.gz