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

Updated usher to create host keys if needed, added dependencies and

Browse Source 
also cleaned up Makefile
This commit is contained in:
Jay Larson
2016-10-30 17:20:10 -05:00
parent 9b4a197003
commit 1dc93711f5
2 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Makefile
View File

@@ -8,12 +8,12 @@
# 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.
DEPENDS = DEPENDS = glibc,openssl,zlib
ARCH = x86_64 ARCH = x86_64
URL = http://www.openssh.com/ URL = http://www.openssh.com/
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 = sr0 SNAPVER = sr1
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')
@@ -21,18 +21,6 @@ SRCDIR := $(shell tar -tf $(ARCHIVE)|head -1|sed 's/\/.*//')
PATCHDIR := $(PWD)/SRC/patches PATCHDIR := $(PWD)/SRC/patches
VERSION := $(shell echo $(SRCDIR)|egrep -o '\-[0-9].*'|sed 's/^-//')$(SNAPVER) 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 include /usr/share/snap/Makefile.snaplinux
$(SRCDIR)/configure: $(ARCHIVE) $(SRCDIR)/configure: $(ARCHIVE)
@@ -51,8 +39,9 @@ $(SRCDIR)/configure: $(ARCHIVE)
@touch $(SRCDIR)/configure @touch $(SRCDIR)/configure
$(SRCDIR)/config.log: $(SRCDIR)/configure $(SRCDIR)/config.log: $(SRCDIR)/configure
@cd $(SRCDIR) && for patch in `find $(PATCHDIR) -name \*.patch`; do \ @cd $(SRCDIR) && \
patch --verbose -Np1 -i $$patch; \ for patch in `find $(PATCHDIR) -name \*.patch|sort`; do \
patch --verbose -Np0 -i $$patch; \
done done
@cd $(SRCDIR); \ @cd $(SRCDIR); \
./configure \ ./configure \
@@ -65,8 +54,7 @@ $(SRCDIR)/config.log: $(SRCDIR)/configure
--target=x86_64-snap-linux-gnu --target=x86_64-snap-linux-gnu
$(SRCDIR)/sshd: $(SRCDIR)/config.log $(SRCDIR)/sshd: $(SRCDIR)/config.log
@cd $(SRCDIR); \ @cd $(SRCDIR) && make
$(MAKE)
$(ROOT): $(SRCDIR)/sshd $(ROOT): $(SRCDIR)/sshd
@if [ -d $(ROOT) ]; then \ @if [ -d $(ROOT) ]; then \
@@ -75,10 +63,16 @@ $(ROOT): $(SRCDIR)/sshd
mkdir -v $(ROOT); \ mkdir -v $(ROOT); \
fi fi
@cd $(SRCDIR); \ @cd $(SRCDIR) && make install DESTDIR=$(ROOT) && \
$(MAKEINST) DESTDIR=$(ROOT) install -v -d -m 755 $(ROOT)/etc/init.d && \
install -v -d -m 755 $(ROOT)/usr/share/doc/openssh && \
@$(SNAPHACKS) 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) test: $(ROOT)
@cd $(SRCDIR); \ @cd $(SRCDIR); \

6
SNAP/usher
View File

@@ -24,7 +24,11 @@ case $1 in
fi fi
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) prerm)
exit 0 exit 0