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

Changes made in this version:

Browse Source 
* Split into separate client and server packages
  * Cleaned up init file
  * Updated usher to support chroot into TARGET
This commit is contained in:
Jay Larson
2017-05-05 15:10:58 -05:00
parent 0f026048c8
commit ddaa5d79d7
5 changed files with 154 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
Makefile
View File

@@ -8,20 +8,63 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
DEPENDS = glibc,openssl,zlib
ARCH = x86_64
URL = http://www.openssh.com/
export SRCPKG = openssh
export DEPENDS = glibc,openssl,zlib
export ARCH = x86_64
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 = sr2
SNAPVER = 4
ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1)
TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n')
SRCDIR := $(shell tar -tf $(ARCHIVE)|head -1|sed 's/\/.*//')
PATCHDIR := $(PWD)/SRC/patches
VERSION := $(shell echo $(SRCDIR)|egrep -o '\-[0-9].*'|sed 's/^-//')$(SNAPVER)
export VERSION := $(shell echo $(SRCDIR)|egrep -o '\-[0-9].*'|\
sed 's/^-//')-$(SNAPVER)
include /usr/share/snap/Makefile.snaplinux
CLIENT := $(PWD)/openssh-client
CLIENTROOT := $(CLIENT)/ROOT
SERVER := $(PWD)/openssh-server
SERVERROOT := $(SERVER)/ROOT
$(SERVERROOT): $(CLIENTROOT)
cd $(SERVER) && make -f ../Makefile.server && mv *.snap ../
$(CLIENTROOT): $(SRCDIR)/sshd
@install -v -d $(CLIENT)/SNAP && \
if [ -d $(CLIENTROOT) ]; then \
touch $(CLIENTROOT); \
else \
mkdir -v $(CLIENTROOT); \
fi
cd $(SRCDIR) && make install DESTDIR=$(CLIENTROOT) && \
install -v -d -m 755 $(CLIENTROOT)/usr/share/doc/openssh && \
install -v -m 755 contrib/ssh-copy-id $(CLIENTROOT)/usr/bin && \
install -v -m 644 contrib/ssh-copy-id.1 \
$(CLIENTROOT)/usr/share/man/man1 && \
install -v -m644 INSTALL LICENCE OVERVIEW README* \
$(CLIENTROOT)/usr/share/doc/openssh && \
gzip $(CLIENTROOT)/usr/share/doc/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 -m 755 $(PWD)/SNAP/sshd.init \
$(SERVERROOT)/etc/init.d/sshd && \
mv -v $(CLIENTROOT)/etc/ssh/sshd_config \
$(SERVERROOT)/etc/ssh/sshd_config && \
mv -v $(CLIENTROOT)/usr/libexec/sftp-server \
$(SERVERROOT)/usr/libexec/sftp-server && \
mv -v $(CLIENTROOT)/usr/sbin/sshd \
$(SERVERROOT)/usr/sbin/sshd && \
mv -v $(CLIENTROOT)/usr/share/man/man5/sshd_config.5 \
$(SERVERROOT)/usr/share/man/man5/sshd_config.5 && \
mv -v $(CLIENTROOT)/usr/share/man/man8/sftp-server.8 \
$(SERVERROOT)/usr/share/man/man8/sftp-server.8 && \
cd $(CLIENT) && make -f ../Makefile.client && mv *.snap ../
$(SRCDIR)/configure: $(ARCHIVE)
@if [ '$(TYPE)' == 'application/x-bzip2' ]; then \
@@ -56,30 +99,14 @@ $(SRCDIR)/config.log: $(SRCDIR)/configure
$(SRCDIR)/sshd: $(SRCDIR)/config.log
@cd $(SRCDIR) && make
$(ROOT): $(SRCDIR)/sshd
@if [ -d $(ROOT) ]; then \
touch $(ROOT); \
else \
mkdir -v $(ROOT); \
fi
@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)
test: $(CLIENTROOT)
@cd $(SRCDIR); \
make tests
clean:
@rm -rvf $(ROOT) \
$(CLIENT) \
$(SERVER) \
$(SNAPINFO) \
$(MANIFEST) \
$(FILES) \