drop openssh patch

3 files changed, 3 insertions, 23 deletions

diff --git a/.gitmodules b/.gitmodules
index fa1f7a0..ca5ab17 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,9 +4,6 @@
 [submodule "kiki"]
         path = kiki
         url = d@cryptonomic.net:public_git/kiki.git
-[submodule "openssh"]
-        path = openssh
-        url = d@cryptonomic.net:public_git/openssh.git
 [submodule "cryptonomic-dyndns-server"]
         path = cryptonomic-dyndns-server
         url = d@cryptonomic.net:public_git/cryptonomic-dyndns-server.git
diff --git a/Makefile b/Makefile
index 754444b..cf5a71c 100644
--- a/Makefile
+++ b/Makefile
@@ -8,13 +8,12 @@ compiled_programs=${cc_files} ${cpp_files}
 CC=gcc -std=gnu99
 CFLAGS=-Os
 
-INSTALL_SUBMODULES = fsmgr kiki openssh
+INSTALL_SUBMODULES = fsmgr kiki
 NO_INSTALL_SUBMODULES = cryptonomic-dyndns-server
 SUBMODULES = $(INSTALL_SUBMODULES) $(NO_INSTALL_SUBMODULES)
 
 all: samizdat-paths.sh ${compiled_programs} ${SUBMODULES}
 
-
 .PHONY: stack install-stack
 install-stack:
         curl -sSL https://get.haskellstack.org/ | sh
diff --git a/rootfs/samizdat.yaml b/rootfs/samizdat.yaml
index cd3718e..60bdc69 100644
--- a/rootfs/samizdat.yaml
+++ b/rootfs/samizdat.yaml
@@ -1,4 +1,5 @@
 parent: samizdat-wip
+apt-update: true
 unpack-only: false
 binaries:
 - samizdat-diff-root
@@ -12,24 +13,7 @@ binaries-optional:
 - dht
 packages:
 - linux-image-$(kver)-$(karch)
-
-- libfido2-dev
-- ../ssh_8.4p1-2_all.deb
-- ../openssh-client_8.4p1-2_$(debarch).deb
-- ../openssh-server_8.4p1-2_$(debarch).deb
-- ../openssh-sftp-server_8.4p1-2_$(debarch).deb
-- ../ssh-askpass-gnome_8.4p1-2_$(debarch).deb
-
-# - ../openssh-tests_8.4p1-2_$(debarch).deb
-# - putty-tools
-# - python3-twisted
-
-# - ../openssh/dh-runit_2.8.11_all.deb
-# - ../openssh/fido2-tools_1.5.0-2_amd64.deb
-# - ../openssh/libfido2-1_1.5.0-2_amd64.deb
-# - ../openssh/libfido2-dev_1.5.0-2_amd64.deb
-# - ../openssh/runit-helper_2.8.11_all.deb
-
+- ssh
 
 unit-files:
 - rc-local.service