main/openssh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

The following changes were made:

Browse Source 
* 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
This commit is contained in:
Jay Larson
2018-03-30 09:36:15 -05:00
parent ad3ba89a0c
commit efba61d10d
5 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Makefile
View File

@@ -16,7 +16,7 @@ export URL = http://www.openssh.com/
BRIEF = OpenSSH client and server BRIEF = OpenSSH client and server
DESC = OpenSSH is the premier connectivity tool for remote login with the \ DESC = OpenSSH is the premier connectivity tool for remote login with the \
SSH protocol. SSH protocol.
SNAPVER = 10 SNAPVER = 11
ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1) ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1)
TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n') TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n')
@@ -54,9 +54,12 @@ $(CLIENTROOT): $(SRCDIR)/sshd
$(CLIENTROOT)/usr/share/openssh && \ $(CLIENTROOT)/usr/share/openssh && \
install -v -d $(SERVER)/SNAP && \ install -v -d $(SERVER)/SNAP && \
install -v -d $(SERVERROOT) && \ install -v -d $(SERVERROOT) && \
install -v -d -m 755 $(SERVERROOT)/etc/{ssh,init.d} && \ install -v -d -m 755 $(SERVERROOT)/etc/init.d && \
install -v -d -m 755 $(SERVERROOT)/usr/{libexec,sbin} && \ install -v -d -m 755 $(SERVERROOT)/etc/ssh && \
install -v -d -m 755 $(SERVERROOT)/usr/share/man/man{5,8} && \ 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 -d -m 755 $(SERVERROOT)/usr/share/openssh && \
install -v -m 755 $(PWD)/SNAP/sshd.init \ install -v -m 755 $(PWD)/SNAP/sshd.init \
$(SERVERROOT)/etc/init.d/sshd && \ $(SERVERROOT)/etc/init.d/sshd && \
@@ -74,13 +77,13 @@ $(CLIENTROOT): $(SRCDIR)/sshd
cd $(CLIENT) && make -f ../Makefile.client && mv *.snap ../ cd $(CLIENT) && make -f ../Makefile.client && mv *.snap ../
$(SRCDIR)/configure: $(ARCHIVE) $(SRCDIR)/configure: $(ARCHIVE)
@if [ '$(TYPE)' == 'application/x-bzip2' ]; then \ @if [ '$(TYPE)' = 'application/x-bzip2' ]; then \
tar -jxf $(ARCHIVE); \ tar -jxf $(ARCHIVE); \
elif [ '$(TYPE)' == 'application/x-gzip' ]; then \ elif [ '$(TYPE)' = 'application/x-gzip' ]; then \
tar -zxf $(ARCHIVE); \ tar -zxf $(ARCHIVE); \
elif [ '$(TYPE)' == 'application/x-tar' ]; then \ elif [ '$(TYPE)' = 'application/x-tar' ]; then \
tar -xf $(ARCHIVE); \ tar -xf $(ARCHIVE); \
elif [ '$(TYPE)' == 'application/x-xz' ]; then \ elif [ '$(TYPE)' = 'application/x-xz' ]; then \
tar -xf $(ARCHIVE); \ tar -xf $(ARCHIVE); \
else \ else \
echo 'Unable to determine archive type'; \ echo 'Unable to determine archive type'; \

1
Makefile.client
View File

@@ -8,6 +8,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
REPO = main
BRIEF = OpenSSH client BRIEF = OpenSSH client
DESC = The OpenSSH client provides a secure method of remotely \ DESC = The OpenSSH client provides a secure method of remotely \
accessing computer systems accessing computer systems

1
Makefile.server
View File

@@ -8,6 +8,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
REPO = server
DEPENDS = glibc,openssh-client,openssl,shadow,zlib DEPENDS = glibc,openssh-client,openssl,shadow,zlib
BRIEF = OpenSSH server BRIEF = OpenSSH server
DESC = The OpenSSH server allows remote users to access the system securely DESC = The OpenSSH server allows remote users to access the system securely

2
SNAP/usher-client
View File

@@ -1,4 +1,4 @@
#!/bin/bash #!/bin/sh
set -e set -e

2
SNAP/usher-server
View File

@@ -1,4 +1,4 @@
#!/bin/bash #!/bin/sh
set -e set -e