From 33bff6b298ce64b92b9fe76468aafe21d691ef82 Mon Sep 17 00:00:00 2001
From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
Date: Sat, 30 Jan 2021 21:51:57 +0100
Subject: [PATCH 1/2] Publish unsigned builds

This should make debugging reproducible builds easier.
---
 fdroidserver/deploy.py | 4 ++++
 tests/run-tests        | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/fdroidserver/deploy.py b/fdroidserver/deploy.py
index ca7bff54..f228edb2 100644
--- a/fdroidserver/deploy.py
+++ b/fdroidserver/deploy.py
@@ -783,6 +783,10 @@ def main():
     if config['per_app_repos']:
         repo_sections += common.get_per_app_repos()
 
+    if os.path.isdir('unsigned') or (local_copy_dir is not None
+                                     and os.path.isdir(os.path.join(local_copy_dir, 'unsigned'))):
+        repo_sections.append('unsigned')
+
     for repo_section in repo_sections:
         if local_copy_dir is not None:
             if config['sync_from_local_copy_dir']:
diff --git a/tests/run-tests b/tests/run-tests
index af415243..7f30d036 100755
--- a/tests/run-tests
+++ b/tests/run-tests
@@ -1202,6 +1202,8 @@ if have_git_2_3; then
     fdroid_init_with_prebuilt_keystore
     printf '\narchive_older: 3\n' >> config.yml
     cp -a $WORKSPACE/tests/metadata $WORKSPACE/tests/repo $WORKSPACE/tests/stats $OFFLINE_ROOT/
+    mkdir $OFFLINE_ROOT/unsigned
+    cp $WORKSPACE/tests/urzip-release-unsigned.apk $OFFLINE_ROOT/unsigned
 
     echo "mirrors: ['http://foo.bar/fdroid', 'http://asdflkdsfjafdsdfhkjh.onion/fdroid']" >> config.yml
     echo "servergitmirrors: $SERVER_GIT_MIRROR" >> config.yml
@@ -1216,6 +1218,7 @@ if have_git_2_3; then
     [ `git rev-list --count HEAD` == "1" ]
     cd ..
     $fdroid deploy --verbose
+    test -e $LOCAL_COPY_DIR/unsigned/urzip-release-unsigned.apk
     grep -F '<application id=' $LOCAL_COPY_DIR/repo/index.xml > /dev/null
     cd $ONLINE_ROOT
     echo "local_copy_dir: $LOCAL_COPY_DIR" >> config.yml
@@ -1225,6 +1228,8 @@ if have_git_2_3; then
     echo "local_copy_dir: $LOCAL_COPY_DIR" >> config.yml
     echo "binary_transparency_remote: $BINARY_TRANSPARENCY_REMOTE" >> config.yml
     $fdroid deploy --verbose
+    test -e $ONLINE_ROOT/unsigned/urzip-release-unsigned.apk
+    test -e $SERVERWEBROOT/unsigned/urzip-release-unsigned.apk
     cd $BINARY_TRANSPARENCY_REMOTE
     [ `git rev-list --count HEAD` == "1" ]
     cd $SERVER_GIT_MIRROR

From 7f2cbd1876ca1325edab8327e869b4347a873a70 Mon Sep 17 00:00:00 2001
From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
Date: Thu, 11 Feb 2021 20:10:54 +0100
Subject: [PATCH 2/2] Fix serverwebroot test

---
 tests/run-tests | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tests/run-tests b/tests/run-tests
index 7f30d036..249dbb9e 100755
--- a/tests/run-tests
+++ b/tests/run-tests
@@ -1181,7 +1181,7 @@ if have_git_2_3; then
     LOCAL_COPY_DIR=`create_test_dir`/fdroid
     mkdir $LOCAL_COPY_DIR
     ONLINE_ROOT=`create_test_dir`
-    SERVERWEBROOT=`create_test_dir`
+    SERVERWEBROOT=`create_test_dir`/fdroid
 
     # create offline binary transparency log
     cd $OFFLINE_ROOT
@@ -1223,9 +1223,8 @@ if have_git_2_3; then
     cd $ONLINE_ROOT
     echo "local_copy_dir: $LOCAL_COPY_DIR" >> config.yml
     echo "sync_from_local_copy_dir: True" >> config.yml
-    echo "serverwebroots: $SERVERWEBROOT" >> config.yml
+    echo "serverwebroot: $SERVERWEBROOT" >> config.yml
     echo "servergitmirrors: $SERVER_GIT_MIRROR" >> config.yml
-    echo "local_copy_dir: $LOCAL_COPY_DIR" >> config.yml
     echo "binary_transparency_remote: $BINARY_TRANSPARENCY_REMOTE" >> config.yml
     $fdroid deploy --verbose
     test -e $ONLINE_ROOT/unsigned/urzip-release-unsigned.apk