From efba61d10d43a11b9718fd4a1acffe81b51c1370 Mon Sep 17 00:00:00 2001
From: Jay Larson <jlarson@snaplinux.org>
Date: Fri, 30 Mar 2018 09:36:15 -0500
Subject: [PATCH] The following changes were made:

  * Modified Makefile to work with /bin/sh
  * Added REPO to Makefile.client and Makefile.server
  * Modified usher-client and usher-server to use /bin/sh
---
 Makefile          | 19 +++++++++++--------
 Makefile.client   |  1 +
 Makefile.server   |  1 +
 SNAP/usher-client |  2 +-
 SNAP/usher-server |  2 +-
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 6652f05..ab038c6 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ export URL = http://www.openssh.com/
 BRIEF = OpenSSH client and server
 DESC = OpenSSH is the premier connectivity tool for remote login with the \
 SSH protocol.
-SNAPVER = 10
+SNAPVER = 11
 
 ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1)
 TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n')
@@ -54,9 +54,12 @@ $(CLIENTROOT): $(SRCDIR)/sshd
 		$(CLIENTROOT)/usr/share/openssh && \
 	install -v -d $(SERVER)/SNAP && \
 	install -v -d $(SERVERROOT) && \
-	install -v -d -m 755 $(SERVERROOT)/etc/{ssh,init.d} && \
-	install -v -d -m 755 $(SERVERROOT)/usr/{libexec,sbin} && \
-	install -v -d -m 755 $(SERVERROOT)/usr/share/man/man{5,8} && \
+	install -v -d -m 755 $(SERVERROOT)/etc/init.d && \
+	install -v -d -m 755 $(SERVERROOT)/etc/ssh && \
+	install -v -d -m 755 $(SERVERROOT)/usr/libexec && \
+	install -v -d -m 755 $(SERVERROOT)/usr/sbin && \
+	install -v -d -m 755 $(SERVERROOT)/usr/share/man/man5 && \
+	install -v -d -m 755 $(SERVERROOT)/usr/share/man/man8 && \
 	install -v -d -m 755 $(SERVERROOT)/usr/share/openssh && \
 	install -v -m 755 $(PWD)/SNAP/sshd.init \
 		$(SERVERROOT)/etc/init.d/sshd && \
@@ -74,13 +77,13 @@ $(CLIENTROOT): $(SRCDIR)/sshd
 	cd $(CLIENT) && make -f ../Makefile.client && mv *.snap ../
 
 $(SRCDIR)/configure: $(ARCHIVE)
-	@if [ '$(TYPE)' == 'application/x-bzip2' ]; then \
+	@if [ '$(TYPE)' = 'application/x-bzip2' ]; then \
 		tar -jxf $(ARCHIVE); \
-	elif [ '$(TYPE)' == 'application/x-gzip' ]; then \
+	elif [ '$(TYPE)' = 'application/x-gzip' ]; then \
 		tar -zxf $(ARCHIVE); \
-	elif [ '$(TYPE)' == 'application/x-tar' ]; then \
+	elif [ '$(TYPE)' = 'application/x-tar' ]; then \
 		tar -xf $(ARCHIVE); \
-	elif [ '$(TYPE)' == 'application/x-xz' ]; then \
+	elif [ '$(TYPE)' = 'application/x-xz' ]; then \
 		tar -xf $(ARCHIVE); \
 	else \
 		echo 'Unable to determine archive type'; \
diff --git a/Makefile.client b/Makefile.client
index 9ef78fa..8b82834 100644
--- a/Makefile.client
+++ b/Makefile.client
@@ -8,6 +8,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
+REPO = main
 BRIEF = OpenSSH client
 DESC = The OpenSSH client provides a secure method of remotely \
 accessing computer systems
diff --git a/Makefile.server b/Makefile.server
index a25945b..33a09be 100644
--- a/Makefile.server
+++ b/Makefile.server
@@ -8,6 +8,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
+REPO = server
 DEPENDS = glibc,openssh-client,openssl,shadow,zlib
 BRIEF = OpenSSH server
 DESC = The OpenSSH server allows remote users to access the system securely
diff --git a/SNAP/usher-client b/SNAP/usher-client
index 2989f7b..a76d233 100755
--- a/SNAP/usher-client
+++ b/SNAP/usher-client
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 set -e
 
diff --git a/SNAP/usher-server b/SNAP/usher-server
index fad9574..9f6cddd 100755
--- a/SNAP/usher-server
+++ b/SNAP/usher-server
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 set -e