From 6a4a78429f901ff90fd944f04806353f09b93442 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20P=C3=B6hn?= Date: Tue, 19 Sep 2017 15:34:29 +0200 Subject: [PATCH] add signer to index v1 --- fdroidserver/update.py | 4 +++- tests/metadata/apk/info.guardianproject.urzip.yaml | 1 + tests/metadata/apk/org.dyndns.fules.ck.yaml | 1 + tests/repo/index.xml | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/fdroidserver/update.py b/fdroidserver/update.py index 99fb80e5..3a74b428 100644 --- a/fdroidserver/update.py +++ b/fdroidserver/update.py @@ -44,7 +44,7 @@ from . import metadata from .common import SdkToolsPopen from .exception import BuildException, FDroidException -METADATA_VERSION = 18 +METADATA_VERSION = 19 # less than the valid range of versionCode, i.e. Java's Integer.MIN_VALUE UNSET_VERSION_CODE = -0x100000000 @@ -976,6 +976,8 @@ def scan_apk(apk_file): apk['sig'] = getsig(apk_file) if not apk['sig']: raise BuildException("Failed to get apk signature") + apk['signer'] = common.apk_signer_fingerprint(os.path.join(os.getcwd(), + apk_file)) # Get size of the APK apk['size'] = os.path.getsize(apk_file) diff --git a/tests/metadata/apk/info.guardianproject.urzip.yaml b/tests/metadata/apk/info.guardianproject.urzip.yaml index 2234cf1f..a2312cdd 100644 --- a/tests/metadata/apk/info.guardianproject.urzip.yaml +++ b/tests/metadata/apk/info.guardianproject.urzip.yaml @@ -12,6 +12,7 @@ icons_src: minSdkVersion: '4' packageName: info.guardianproject.urzip sig: e0ecb5fc2d63088e4a07ae410a127722 +signer: 7eabd8c15de883d1e82b5df2fd4f7f769e498078e9ad6dc901f0e96db77ceac3 size: 9969 targetSdkVersion: '18' uses-permission: [] diff --git a/tests/metadata/apk/org.dyndns.fules.ck.yaml b/tests/metadata/apk/org.dyndns.fules.ck.yaml index cbb62836..2f382c48 100644 --- a/tests/metadata/apk/org.dyndns.fules.ck.yaml +++ b/tests/metadata/apk/org.dyndns.fules.ck.yaml @@ -24,6 +24,7 @@ nativecode: - x86_64 packageName: org.dyndns.fules.ck sig: 9bf7a6a67f95688daec75eab4b1436ac +signer: 9326a2cc1a2f148202bc7837a0af3b81200bd37fd359c9e13a2296a71d342056 size: 132453 targetSdkVersion: '8' uses-permission: diff --git a/tests/repo/index.xml b/tests/repo/index.xml index a2eb17e3..b10b7c0a 100644 --- a/tests/repo/index.xml +++ b/tests/repo/index.xml @@ -1,6 +1,6 @@ - + This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/u/fdroid. http://foobarfoobarfoobar.onion/fdroid/repo https://foo.bar/fdroid/repo