This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".
The branch, master has been updated via 0f7866b5e9298bf0a8d39425065985b0f42bda9b (commit) from bbf8af865e6dd38e5856e3d224de951d57aef8e5 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 0f7866b5e9298bf0a8d39425065985b0f42bda9b Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Aug 7 19:01:56 2011 +0200
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
-----------------------------------------------------------------------
Summary of changes: pkgs/openssh/openssh.nm | 35 ++++++++++++++++++++++++--------- pkgs/openssh/systemd/openssh.service | 1 + 2 files changed, 26 insertions(+), 10 deletions(-)
Difference in files: diff --git a/pkgs/openssh/openssh.nm b/pkgs/openssh/openssh.nm index 1aa9573..ca079eb 100644 --- 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 49a2853..7fdd641 100644 --- 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
hooks/post-receive -- IPFire 3.x development tree