mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-09 08:50:28 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Work around old apksigner on f-droid.org publish server

Browse source
This commit is contained in:
Jochen Sprickerhof 2022-09-20 13:58:41 +00:00 • committed by Hans-Christoph Steiner
parent 2b5ac31bf8
commit cf228d35a3
3 changed files with 30 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
fdroidserver/common.py
View file

@ -85,7 +85,8 @@ FDROID_PATH = os.path.realpath(os.path.join(os.path.dirname(__file__), '..'))
# 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'
# 30.0.0 is the first version to support --v4-signing-enabled.
# 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
# (as does android, so we want that)
MINIMUM_APKSIGNER_BUILD_TOOLS_VERSION = '30.0.0'

8
fdroidserver/signindex.py
View file

@ -111,7 +111,13 @@ def sign_jar(jar, use_old_algs=False):
}
p = common.FDroidPopen(args, envs=env_vars)
if p.returncode != 0:
raise FDroidException("Failed to sign %s: %s" % (jar, p.output))
# workaround for buster-backports apksigner on f-droid.org publish server
v4 = args.index("--v4-signing-enabled")
del args[v4 + 1]
del args[v4]
p = common.FDroidPopen(args, envs=env_vars)
if p.returncode != 0:
raise FDroidException("Failed to sign %s: %s" % (jar, p.output))
def sign_index(repodir, json_name):