bump openssh

update rootfs to use bumped openssh packages

11 files changed, 80 insertions, 40 deletions

diff --git a/.gitignore b/.gitignore
index 509ad7c..8649537 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,22 +19,23 @@ install-submodules-stamp
 conf/br0
 conf/dnsmasq.conf
 conf/network_if-up.d_samizdat
-openssh-client-dbgsym_7.9p1-10_amd64.deb
-openssh-client-udeb_7.9p1-10_amd64.udeb
-openssh-client_7.9p1-10_amd64.deb
-openssh-server-dbgsym_7.9p1-10_amd64.deb
-openssh-server-udeb_7.9p1-10_amd64.udeb
-openssh-server_7.9p1-10_amd64.deb
-openssh-sftp-server-dbgsym_7.9p1-10_amd64.deb
-openssh-sftp-server_7.9p1-10_amd64.deb
-openssh-tests-dbgsym_7.9p1-10_amd64.deb
-openssh-tests_7.9p1-10_amd64.deb
-openssh_7.9p1-10_amd64.buildinfo
-openssh_7.9p1-10_amd64.changes
+ssh_*.deb
+openssh-client-dbgsym_*_*.deb
+openssh-client-udeb_*_*.udeb
+openssh-client_*_*.deb
+openssh-server-dbgsym_*_*.deb
+openssh-server-udeb_*_*.udeb
+openssh-server_*_*.deb
+openssh-sftp-server-dbgsym_*_*.deb
+openssh-sftp-server_*_*.deb
+openssh-tests-dbgsym_*_*.deb
+openssh-tests_*_*.deb
+openssh_*_*.buildinfo
+openssh_*_*.changes
+ssh-askpass-gnome-dbgsym_*_*.deb
+ssh-askpass-gnome_*_*.deb
+ssh_*_all.deb
 rootfs/samizdat.btrfs
-ssh-askpass-gnome-dbgsym_7.9p1-10_amd64.deb
-ssh-askpass-gnome_7.9p1-10_amd64.deb
-ssh_7.9p1-10_all.deb
 rootfs/_build/
 /build-deps-stamp
 stack.yaml.lock
diff --git a/openssh b/openssh
-Subproject 88a7879d71c774d96fea148186697393e480375
+Subproject f1e35696f309486236df2a0be0a98b227d542cc
diff --git a/rootfs/.gitignore b/rootfs/.gitignore
new file mode 100644
index 0000000..477634d
--- /dev/null
+++ b/rootfs/.gitignore
@@ -0,0 +1 @@
+*~tmp
diff --git a/rootfs/Makefile b/rootfs/Makefile
index 6696c14..9e4e15a 100644
--- a/rootfs/Makefile
+++ b/rootfs/Makefile
@@ -6,7 +6,13 @@ endif
 
 sudo := $(shell [ "$$(id -u)" = 0 ] || echo sudo)
 
-rootfs = samiztest
+rootfs ?= samizdat.btrfs
+patchfs ?= samizdat.patch.btrfs
 
-all:
+.PHONY: all rootfs patchfs
+all: rootfs $(ifneq $(patchfs),,patchfs)
+
+rootfs $(rootfs):
         $(sudo) $(fsmgr) build $(rootfs)
+patchfs $(patchfs): $(rootfs)
+        $(sudo) $(fsmgr) build $(patchfs)
diff --git a/rootfs/prefetch-packages.sh b/rootfs/prefetch-packages.sh
new file mode 100755
index 0000000..3d19c14
--- /dev/null
+++ b/rootfs/prefetch-packages.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+apt-get -yd install baresip wicd connman network-manager
+apt-mark install baresip
diff --git a/rootfs/samizdat-hostname.sh b/rootfs/samizdat-hostname.sh
new file mode 100755
index 0000000..52837ba
--- /dev/null
+++ b/rootfs/samizdat-hostname.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+hostnames()
+{
+cat <<EOF
+adam
+billy
+cletus
+doris
+elaine
+frank
+gilbert
+hilda
+EOF
+}
+
+next_hostname()
+{
+    h=$(hostname) || exit
+    hostnames | sed -n "/^${h}\$/ {n;p;q}" || exit
+}
+
+set -x
+hostname=$(next_hostname)
+[ "$hostname" ] || hostname=$(hostnames | head -n1)
+printf '%s\n' "$hostname" > /etc/hostname
+sed -i -e 's/\blocalhost\b/& '"$hostname"'/' /etc/hosts
diff --git a/rootfs/samizdat-patch-root.sh b/rootfs/samizdat-patch-root.sh
new file mode 100755
index 0000000..296ef78
--- /dev/null
+++ b/rootfs/samizdat-patch-root.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+true
diff --git a/rootfs/patchroot.sh b/rootfs/samizdat-update-apt-cache.sh
index 76eb26a..83751a3 100755
--- a/rootfs/patchroot.sh
+++ b/rootfs/samizdat-update-apt-cache.sh
@@ -1,11 +1,8 @@
 #!/bin/sh
-hostname=adam
-echo $hostname > /etc/hostname
-sed -i -e 's/\blocalhost\b/& '"$hostname"'/' /etc/hosts
+# TODO: Write this in fsmgr
 
 . /etc/os-release
 
-# TODO: Write this in fsmgr
 cat <<END > /etc/apt/sources.list
 deb  http://httpredir.debian.org/debian  ${VERSION_CODENAME}            main  #contrib  non-free
 deb  http://security.debian.org          ${VERSION_CODENAME}/updates    main  #contrib  non-free
@@ -15,9 +12,8 @@ END
 set -- /var/lib/apt/lists/*_Packages
 if [ -f "$1" ]
 then
-    # apt database validity demonstration
-    apt-get update
+    apt-get update || exit
     apt-cache dumpavail | dpkg --update-avail -
-    apt-get -yd install iso-codes # baresip
-    apt-mark install baresip
+else
+    false
 fi
diff --git a/rootfs/samizdat-wip.yaml b/rootfs/samizdat-wip.yaml
index 36d6fe7..afb92ea 100644
--- a/rootfs/samizdat-wip.yaml
+++ b/rootfs/samizdat-wip.yaml
@@ -1,12 +1,12 @@
 parent: kernel
 unpack-only: false
 packages:
-- ../openssh-client_7.9p1-10_$(debarch).deb
-- ../openssh-server_7.9p1-10_$(debarch).deb
-- ../openssh-sftp-server_7.9p1-10_$(debarch).deb
-# ../openssh-tests_7.9p1-10_$(debarch).deb
-- ../ssh_7.9p1-10_all.deb
-- ../ssh-askpass-gnome_7.9p1-10_$(debarch).deb
+- ../openssh-client_8.3p1-1_$(debarch).deb
+- ../openssh-server_8.3p1-1_$(debarch).deb
+- ../openssh-sftp-server_8.3p1-1_$(debarch).deb
+# ../openssh-tests_8.3p1-1_$(debarch).deb
+- ../ssh_8.3p1-1_all.deb
+- ../ssh-askpass-gnome_8.3p1-1_$(debarch).deb
 
 - dnsutils
 - cron
diff --git a/rootfs/samizdat.patch.yaml b/rootfs/samizdat.patch.yaml
new file mode 100644
index 0000000..d2d5314
--- /dev/null
+++ b/rootfs/samizdat.patch.yaml
@@ -0,0 +1,12 @@
+parent: samizdat
+seedme: 600000000
+apt-update: true
+binaries:
+- './samizdat-update-apt-cache.sh'
+- './samizdat-patch-root.sh'
+- './samizdat-hostname.sh'
+chroot-commands:
+- "/usr/local/bin/samizdat-update-apt-cache.sh"
+- "/usr/local/bin/samizdat-patch-root.sh"
+- "/usr/local/bin/samizdat-hostname.sh"
+
diff --git a/rootfs/samiztest.yaml b/rootfs/samiztest.yaml
deleted file mode 100644
index 42ca627..0000000
--- a/rootfs/samiztest.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-parent: samizdat
-binaries:
-- './patchroot.sh'
-seedme: 600000000
-apt-update: true
-
-chroot-commands:
-- "/usr/local/bin/patchroot.sh"
-