From 16c9a6c86268bb3ac64f05fa180a800e1d67da5f Mon Sep 17 00:00:00 2001
From: Disassembler <disassembler@dasm.cz>
Date: Sun, 26 Apr 2020 18:46:11 +0200
Subject: [PATCH] Bump spoc version and reflect /tmp mode change in spoc#6

---
 apk/spoc                                                     | 2 +-
 apk/vmmgr                                                    | 2 +-
 extra/graveyard/crismapp/image                               | 4 ++--
 extra/graveyard/crismapp/image.d/{ => tmp}/config.patch      | 0
 lxc-apps/sahana/image                                        | 4 ++--
 lxc-apps/sahana/image.d/tmp/{python38.patch => compat.patch} | 0
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename extra/graveyard/crismapp/image.d/{ => tmp}/config.patch (100%)
 rename lxc-apps/sahana/image.d/tmp/{python38.patch => compat.patch} (100%)

diff --git a/apk/spoc b/apk/spoc
index ba9baa9..bb69467 160000
--- a/apk/spoc
+++ b/apk/spoc
@@ -1 +1 @@
-Subproject commit ba9baa93623133b4f22d0dd959d9d1dd74dcfc5b
+Subproject commit bb694671f26ea0327389a01fc695fd7dcefd5abf
diff --git a/apk/vmmgr b/apk/vmmgr
index f6c7823..17743ff 160000
--- a/apk/vmmgr
+++ b/apk/vmmgr
@@ -1 +1 @@
-Subproject commit f6c7823b6a3f9e95db856f81618e55920cf3545a
+Subproject commit 17743ff767e2cf7a4178fb4ae9a32384b9a2ff16
diff --git a/extra/graveyard/crismapp/image b/extra/graveyard/crismapp/image
index e664d10..f50d7b6 100644
--- a/extra/graveyard/crismapp/image
+++ b/extra/graveyard/crismapp/image
@@ -17,8 +17,8 @@ COPY image.d
 RUN EOF
     # Patch config
     cd /srv/crismapp
-    patch -p0 </config.patch
-    rm /config.patch
+    patch -p0 </tmp/config.patch
+    rm /tmp/config.patch
 
     # Create OS user
     addgroup -S -g 8080 crismapp
diff --git a/extra/graveyard/crismapp/image.d/config.patch b/extra/graveyard/crismapp/image.d/tmp/config.patch
similarity index 100%
rename from extra/graveyard/crismapp/image.d/config.patch
rename to extra/graveyard/crismapp/image.d/tmp/config.patch
diff --git a/lxc-apps/sahana/image b/lxc-apps/sahana/image
index 2e6b1a6..d1181dc 100644
--- a/lxc-apps/sahana/image
+++ b/lxc-apps/sahana/image
@@ -44,13 +44,13 @@ RUN EOF
 
     # Patch web2py for python 3.8
     cd /srv/web2py
-    patch -p0 </tmp/python38.patch
+    patch -p0 </tmp/compat.patch
 
     # Cleanup
     apk --no-cache del .deps
     find /srv/web2py -name '.git*' -exec rm -rf {} +
     rm -r /root/.cache
-    rm /tmp/python38.patch
+    rm /tmp/compat.patch
 EOF
 
 CMD /bin/s6-svscan /etc/services.d
diff --git a/lxc-apps/sahana/image.d/tmp/python38.patch b/lxc-apps/sahana/image.d/tmp/compat.patch
similarity index 100%
rename from lxc-apps/sahana/image.d/tmp/python38.patch
rename to lxc-apps/sahana/image.d/tmp/compat.patch