From 1dc93711f5382f90a2cc8dadfea02466a6aa1353 Mon Sep 17 00:00:00 2001
From: Jay Larson <jlarson@snaplinux.org>
Date: Sun, 30 Oct 2016 17:20:10 -0500
Subject: [PATCH] Updated usher to create host keys if needed, added
 dependencies and also cleaned up Makefile

---
 Makefile   | 38 ++++++++++++++++----------------------
 SNAP/usher |  6 +++++-
 2 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/Makefile b/Makefile
index 2ee7a14..a185add 100644
--- a/Makefile
+++ b/Makefile
@@ -8,12 +8,12 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-DEPENDS =
+DEPENDS = glibc,openssl,zlib
 ARCH = x86_64
 URL = http://www.openssh.com/
 DESC = OpenSSH is the premier connectivity tool for remote login with the \
 SSH protocol.
-SNAPVER = sr0
+SNAPVER = sr1
 
 ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1)
 TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n')
@@ -21,18 +21,6 @@ SRCDIR := $(shell tar -tf $(ARCHIVE)|head -1|sed 's/\/.*//')
 PATCHDIR := $(PWD)/SRC/patches
 VERSION := $(shell echo $(SRCDIR)|egrep -o '\-[0-9].*'|sed 's/^-//')$(SNAPVER)
 
-MAKE = make
-MAKEINST = make install
-SNAPHACKS = install -v -d -m 755 $(ROOT)/etc/init.d && \
-	install -v -d -m 755 $(ROOT)/usr/share/doc/openssh && \
-	install -v -d -m 700 $(ROOT)/var/run/sshd && \
-	install -v -m 755 $(SRCDIR)/contrib/ssh-copy-id $(ROOT)/usr/bin && \
-	install -v -m 755 SNAP/sshd.init $(ROOT)/etc/init.d/sshd && \
-	install -v -m 644 $(SRCDIR)/contrib/ssh-copy-id.1 \
-		$(ROOT)/usr/share/man/man1 && \
-	cd $(SRCDIR) && install -v -m644 INSTALL LICENCE OVERVIEW README* \
-		$(ROOT)/usr/share/doc/openssh
-
 include /usr/share/snap/Makefile.snaplinux
 
 $(SRCDIR)/configure: $(ARCHIVE)
@@ -51,8 +39,9 @@ $(SRCDIR)/configure: $(ARCHIVE)
 	@touch $(SRCDIR)/configure
 
 $(SRCDIR)/config.log: $(SRCDIR)/configure
-	@cd $(SRCDIR) && for patch in `find $(PATCHDIR) -name \*.patch`; do \
-		patch --verbose -Np1 -i $$patch; \
+	@cd $(SRCDIR) && \
+	for patch in `find $(PATCHDIR) -name \*.patch|sort`; do \
+		patch --verbose -Np0 -i $$patch; \
 	done
 	@cd $(SRCDIR); \
 	./configure \
@@ -65,8 +54,7 @@ $(SRCDIR)/config.log: $(SRCDIR)/configure
 		--target=x86_64-snap-linux-gnu
 
 $(SRCDIR)/sshd: $(SRCDIR)/config.log
-	@cd $(SRCDIR); \
-	$(MAKE)
+	@cd $(SRCDIR) && make
 
 $(ROOT): $(SRCDIR)/sshd
 	@if [ -d $(ROOT) ]; then \
@@ -75,10 +63,16 @@ $(ROOT): $(SRCDIR)/sshd
 		mkdir -v $(ROOT); \
 	fi
 
-	@cd $(SRCDIR); \
-	$(MAKEINST) DESTDIR=$(ROOT)
-
-	@$(SNAPHACKS)
+	@cd $(SRCDIR) && make install DESTDIR=$(ROOT) && \
+	install -v -d -m 755 $(ROOT)/etc/init.d && \
+	install -v -d -m 755 $(ROOT)/usr/share/doc/openssh && \
+	install -v -d -m 700 $(ROOT)/var/run/sshd && \
+	install -v -m 755 contrib/ssh-copy-id $(ROOT)/usr/bin && \
+	install -v -m 755 $(PWD)/SNAP/sshd.init $(ROOT)/etc/init.d/sshd && \
+	install -v -m 644 contrib/ssh-copy-id.1 \
+		$(ROOT)/usr/share/man/man1 && \
+	install -v -m644 INSTALL LICENCE OVERVIEW README* \
+		$(ROOT)/usr/share/doc/openssh
 
 test: $(ROOT)
 	@cd $(SRCDIR); \
diff --git a/SNAP/usher b/SNAP/usher
index eab6656..75f93db 100755
--- a/SNAP/usher
+++ b/SNAP/usher
@@ -24,7 +24,11 @@ case $1 in
       fi
     fi
 
-    chown -v root:root /var/run/sshd
+    chown root:root /var/run/sshd
+
+    if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then
+      ssh-keygen -A
+    fi
     ;;
   prerm)
     exit 0