fdroidserver 2.3a1__tar.gz → 2.3a2__tar.gz

{fdroidserver-2.3a1 → fdroidserver-2.3a2}/MANIFEST.in

@@ -21,6 +21,7 @@ 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
@@ -36,6 +37,8 @@ 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
@@ -797,6 +800,14 @@ 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/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

{fdroidserver-2.3a1/fdroidserver.egg-info → fdroidserver-2.3a2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fdroidserver
-Version: 2.3a1
+Version: 2.3a2
 Summary: F-Droid Server Tools
 Home-page: https://f-droid.org
 Author: The F-Droid Project
@@ -59,6 +59,19 @@ 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:
@@ -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.3a2}/README.md

@@ -34,6 +34,19 @@ 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:
@@ -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.3a2}/buildserver/provision-apt-get-install

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

{fdroidserver-2.3a1 → fdroidserver-2.3a2}/completion/bash-completion

@@ -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

{fdroidserver-2.3a1 → fdroidserver-2.3a2}/examples/config.yml

@@ -183,7 +183,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 +209,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 +298,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 +320,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.

{fdroidserver-2.3a1 → fdroidserver-2.3a2}/fdroidserver/build.py

@@ -989,8 +989,6 @@ def parse_commandline():
                         help=_("Test mode - put output in the tmp directory only, and always build, even if the output already exists."))
     parser.add_argument("--server", action="store_true", default=False,
                         help=_("Use build server"))
-    parser.add_argument("--reset-server", action="store_true", default=False,
-                        help=_("Reset and create a brand new build server, even if the existing one appears to be ok."))
     # this option is internal API for telling fdroid that
     # it's running inside a buildserver vm.
     parser.add_argument("--on-server", dest="onserver", action="store_true", default=False,
@@ -1080,8 +1078,6 @@ def main():
 
     if config['build_server_always']:
         options.server = True
-    if options.reset_server and not options.server:
-        parser.error("option %s: Using --reset-server without --server makes no sense" % "reset-server")
 
     log_dir = 'logs'
     if not os.path.isdir(log_dir):

{fdroidserver-2.3a1 → fdroidserver-2.3a2}/fdroidserver/checkupdates.py

@@ -406,7 +406,7 @@ def possible_subdirs(app: metadata.App):
     for d in dirs_with_manifest(build_dir):
         m_paths = common.manifest_paths(d, last_build.gradle)
         package = common.parse_androidmanifests(m_paths, app)[2]
-        if package is not None:
+        if package is not None or app.UpdateCheckName == "Ignore":
             subdir = d.relative_to(build_dir)
             logging.debug("Adding possible subdir %s" % subdir)
             yield subdir

{fdroidserver-2.3a1 → fdroidserver-2.3a2}/fdroidserver/common.py

@@ -29,6 +29,7 @@
 # libraries here as they will become a requirement for all commands.
 
 import difflib
+from typing import List
 import git
 import glob
 import io
@@ -132,17 +133,17 @@ orig_path = None
 
 
 def get_default_cachedir():
-    """Get a cachedir, using appdirs for cross-platform, but works without.
+    """Get a cachedir, using platformdirs for cross-platform, but works without.
 
-    Once appdirs is installed everywhere, this function can be
+    Once platformdirs is installed everywhere, this function can be
     removed.
 
     """
     appname = __name__.split('.')[0]
     try:
-        import appdirs
+        import platformdirs
 
-        return appdirs.user_cache_dir(appname, 'F-Droid')
+        return platformdirs.user_cache_dir(appname, 'F-Droid')
     except ImportError:
         return str(Path.home() / '.cache' / appname)
 
@@ -1389,12 +1390,9 @@ class vcs_git(vcs):
                 raise VCSException(_("Git clean failed"), p.output)
             if not self.refreshed:
                 # Get latest commits and tags from remote
-                p = self.git(['fetch', 'origin'], cwd=self.local)
+                p = self.git(['fetch', '--prune', '--prune-tags', '--force', 'origin'], cwd=self.local)
                 if p.returncode != 0:
                     raise VCSException(_("Git fetch failed"), p.output)
-                p = self.git(['remote', 'prune', 'origin'], output=False, cwd=self.local)
-                if p.returncode != 0:
-                    raise VCSException(_("Git prune failed"), p.output)
                 p = self.git(['fetch', '--prune', '--tags', '--force', 'origin'], output=False, cwd=self.local)
                 if p.returncode != 0:
                     raise VCSException(_("Git fetch failed"), p.output)
@@ -4300,7 +4298,7 @@ def get_app_display_name(app):
     return app.get('AutoName') or app['id']
 
 
-def local_rsync(options, fromdir, todir):
+def local_rsync(options, from_paths: List[str], todir: str):
     """Rsync method for local to local copying of things.
 
     This is an rsync wrapper with all the settings for safe use within
@@ -4317,8 +4315,8 @@ def local_rsync(options, fromdir, todir):
         rsyncargs += ['--verbose']
     if options.quiet:
         rsyncargs += ['--quiet']
-    logging.debug(' '.join(rsyncargs + [fromdir, todir]))
-    if subprocess.call(rsyncargs + [fromdir, todir]) != 0:
+    logging.debug(' '.join(rsyncargs + from_paths + [todir]))
+    if subprocess.call(rsyncargs + from_paths + [todir]) != 0:
         raise FDroidException()
 
 
@@ -4413,27 +4411,39 @@ def get_per_app_repos():
     return repos
 
 
+# list of index files that are never gpg-signed
+NO_GPG_INDEX_FILES = [
+    "entry.jar",
+    "index-v1.jar",
+    "index.css",
+    "index.html",
+    "index.jar",
+    "index.png",
+    "index.xml",
+]
+
+# list of index files that are signed by gpgsign.py to make a .asc file
+GPG_INDEX_FILES = [
+    "altstore-index.json",
+    "entry.json",
+    "index-v1.json",
+    "index-v2.json",
+]
+
+
+INDEX_FILES = sorted(
+    NO_GPG_INDEX_FILES + GPG_INDEX_FILES + [i + '.asc' for i in GPG_INDEX_FILES]
+)
+
+
 def is_repo_file(filename, for_gpg_signing=False):
     """Whether the file in a repo is a build product to be delivered to users."""
     if isinstance(filename, str):
         filename = filename.encode('utf-8', errors="surrogateescape")
-    ignore_files = [
-        b'entry.jar',
-        b'index-v1.jar',
-        b'index.css',
-        b'index.html',
-        b'index.jar',
-        b'index.png',
-        b'index.xml',
-        b'index_unsigned.jar',
-    ]
+    ignore_files = [i.encode() for i in NO_GPG_INDEX_FILES]
+    ignore_files.append(b'index_unsigned.jar')
     if not for_gpg_signing:
-        ignore_files += [
-            b'altstore-index.json',
-            b'entry.json',
-            b'index-v1.json',
-            b'index-v2.json',
-        ]
+        ignore_files += [i.encode() for i in GPG_INDEX_FILES]
 
     return (
         os.path.isfile(filename)