From a2645185d49edbdeb1d0a44a26cc69d43232b2fe Mon Sep 17 00:00:00 2001
From: Andrew Cady <d@jerkface.net>
Date: Sat, 13 Mar 2021 15:02:29 -0500
Subject: bump version.  drop internal builds of libfido2 and dh-runit.  depend
 on sid.  drop gtk support.

---
 .gitignore |  1 +
 Makefile   | 53 ++++++++++-------------------------------------------
 dh-runit   |  1 -
 libfido2   |  1 -
 4 files changed, 11 insertions(+), 45 deletions(-)
 delete mode 160000 dh-runit
 delete mode 160000 libfido2

diff --git a/.gitignore b/.gitignore
index bd6235b5c..c8faa0cb5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,3 +49,4 @@ debian/openssh-sftp-server/DEBIAN/md5sums
 debian/openssh-sftp-server/usr/share/doc/openssh-sftp-server
 debian/openssh-sftp-server/usr/share/man/man8/sftp-server.8.gz
 install-stamp
+install-deps-stamp
diff --git a/Makefile b/Makefile
index 292fed9e4..69ccb1bb9 100644
--- a/Makefile
+++ b/Makefile
@@ -5,66 +5,33 @@ endef
 arch := $(shell dpkg-architecture -q DEB_HOST_ARCH)
 version := $(shell $(call get_package_version, .))
 
-fido_version := $(shell $(call get_package_version, libfido2))
-dh_runit_version := $(shell $(call get_package_version, dh-runit))
-# fido_version = 1.4.0-2
-# dh_runit_version = 2.8.11
-
 packages = openssh-client openssh-server openssh-sftp-server
 
 package_files = $(addsuffix _$(version)_$(arch).deb,$(addprefix ../,$(packages)))
 
-fido_package_files = \
-	fido2-tools_$(fido_version)_$(arch).deb \
-	fido2-tools-dbgsym_$(fido_version)_$(arch).deb \
-	libfido2-1_$(fido_version)_$(arch).deb \
-	libfido2-1-dbgsym_$(fido_version)_$(arch).deb \
-	libfido2-dev_$(fido_version)_$(arch).deb \
-	libfido2-doc_$(fido_version)_all.deb
-
-dh_runit_package_files = \
-	dh-runit_$(dh_runit_version)_all.deb \
-	runit-helper_$(dh_runit_version)_all.deb
-
 committed_build_products = config.guess config.h.in config.sub configure aclocal.m4
 
 .DEFAULT_GOAL = build-stamp
 
 gitignore:
 	git checkout $(committed_build_products)
+	rm -f debian/autoreconf.after debian/autoreconf.before
 
-build-stamp: libfido2/install-stamp dh-runit/install-stamp
-
-BB_TOOL = apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends -t buster-backports
+SID_TOOL = apt -o Debug::pkgProblemResolver=yes --no-install-recommends -t sid
 
 build-stamp: pkgs=$(package_files)
-libfido2/build-stamp: pkgs=$(fido_package_files)
-libfido2/build-stamp: mbd_tool="-t $(BB_TOOL)"
-dh-runit/build-stamp: pkgs=$(dh_runit_package_files)
-
-build-stamp libfido2/build-stamp dh-runit/build-stamp:
-	cd $(dir $@) && mk-build-deps $(mbd_tool) ./debian/control --install --root-cmd sudo --remove || true
-	cd $(dir $@) && dpkg-buildpackage -us -uc -nc
-	for pkg in $(pkgs); do [ -e "$$pkg" ] || exit; done
-	touch $@
 
-$(package_files): build-stamp
-$(fido_package_files): libfido2/build-stamp
-$(dh_runit_package_files): dh-runit/build-stamp
+install-deps-stamp:
+	DEB_BUILD_PROFILES=pkg.openssh.nognome mk-build-deps --tool="$(SID_TOOL)" ./debian/control --install --root-cmd sudo --remove || true
+	touch $@
 
-install: libfido2/install-stamp dh-runit/install-stamp install-stamp
+build-stamp: install-deps-stamp
+	DEB_BUILD_PROFILES=pkg.openssh.nognome dpkg-buildpackage -us -uc -nc
 
-libfido2/install-stamp: dh-runit/install-stamp libfido2/build-stamp
-	sudo dpkg -i \
-		libfido2-1_$(fido_version)_$(arch).deb \
-		libfido2-dev_$(fido_version)_$(arch).deb
-	touch $@
+$(package_files): build-stamp
 
-dh-runit/install-stamp: dh-runit/build-stamp
-	sudo dpkg -i \
-		dh-runit_$(dh_runit_version)_all.deb \
-		runit-helper_$(dh_runit_version)_all.deb
-	touch $@
+build-stamp:
+install: build-stamp install-stamp
 
 install-stamp: $(package_files)
 	sudo dpkg -i $(package_files)
diff --git a/dh-runit b/dh-runit
deleted file mode 160000
index 1e70c78bb..000000000
--- a/dh-runit
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1e70c78bb3a793ff2d5fc2f89f139dc46502e8e7
diff --git a/libfido2 b/libfido2
deleted file mode 160000
index 5f90f3751..000000000
--- a/libfido2
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 5f90f3751072c849a242a3633a2ce893794e960c
-- 
cgit v1.2.3