openssh: Rework package.

* Move binaries from the clients to the base package.
* Move systemd unit file to server package.
* Add restart option to systemd unit file.

Fixes #225

diff --git a/pkgs/openssh/openssh.nm b/pkgs/openssh/openssh.nm
index 1aa95733b9ab786563187ab19856d0d1078aaaa0..ca079ebf35600b122c590a9649cdf884065dcefd 100644 (file)
--- a/pkgs/openssh/openssh.nm
+++ b/pkgs/openssh/openssh.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
 
 PKG_NAME       = openssh
 PKG_VER        = 5.8p1
-PKG_REL        = 7
+PKG_REL        = 8
 
 PKG_MAINTAINER =
 PKG_GROUPS     = Application/Internet
@@ -55,26 +55,40 @@ PKG_PACKAGES  += openssh-clients openssh-server
 PKG_SUMMARY-openssh-server     = OpenSSH server applications.
 PKG_DESCRIPTION-openssh-server  = $(PKG_SUMMARY-openssh-server)
 PKG_FILES-openssh-server        = \
-       /etc/init/ \
-       /etc/pam.d/ \
+       /etc/pam.d/sshd \
        /etc/ssh/moduli \
        /etc/ssh/sshd_config \
+       /lib/systemd/system/openssh.service \
        /usr/lib/openssh/sftp-server \
-       /usr/sbin/ \
+       /usr/lib/openssh/ssh-keygen \
+       /usr/sbin/sshd \
        /usr/share/man/cat5/sshd_config.5* \
        /usr/share/man/cat5/moduli.5* \
        /usr/share/man/cat8/sshd.8* \
        /usr/share/man/cat8/sftp-server.8* \
-       /usr/share/sshd/ \
-       /var/
+       /var
 
 PKG_SUMMARY-openssh-clients     = OpenSSH client applications.
 PKG_DESCRIPTION-openssh-clients = $(PKG_SUMMARY-openssh-clients)
 PKG_FILES-openssh-clients       = \
-       /etc/ \
-       /usr/bin/ \
-       /usr/lib/ \
-       /usr/share/
+       /etc/ssh/ssh_config \
+       /usr/bin/scp \
+       /usr/bin/sftp \
+       /usr/bin/slogin \
+       /usr/bin/ssh \
+       /usr/bin/ssh-add \
+       /usr/bin/ssh-agent \
+       /usr/bin/ssh-keyscan \
+       /usr/lib/openssh/ssh-pkcs11-helper \
+       /usr/share/man/cat1/scp.1 \
+       /usr/share/man/cat1/sftp.1 \
+       /usr/share/man/cat1/slogin.1 \
+       /usr/share/man/cat1/ssh-add.1 \
+       /usr/share/man/cat1/ssh-agent.1 \
+       /usr/share/man/cat1/ssh-keyscan.1 \
+       /usr/share/man/cat1/ssh.1 \
+       /usr/share/man/cat5/ssh_config.5 \
+       /usr/share/man/cat8/ssh-pkcs11-helper.8
 
 # Apply patches in a special order
 PKG_PATCHES   = openssh-5.6p1-redhat.patch
@@ -113,3 +127,4 @@ define STAGE_INSTALL_CMDS
        install -m 754 $(DIR_SOURCE)/ssh-keygen $(BUILDROOT)/usr/lib/openssh/
 endef
 
+# XXX User and Group "sshd" needs to be created at the installation of the openssh-server package.

diff --git a/pkgs/openssh/systemd/openssh.service b/pkgs/openssh/systemd/openssh.service
index 49a28533ff154e78293aa9b29e0aead3e3d4a0f8..7fdd641cf35e90cebf818178458e16b50f0f21c8 100644 (file)
--- a/pkgs/openssh/systemd/openssh.service
+++ b/pkgs/openssh/systemd/openssh.service
@@ -6,6 +6,7 @@ After=network.target
 ExecStartPre=/usr/lib/openssh/ssh-keygen
 ExecStart=/usr/sbin/sshd -D
 ExecReload=/bin/kill -HUP $MAINPID
+Restart=always
 
 [Install]
 WantedBy=multi-user.target