From b2ae6500f285e7a7a387ab874bc88d68a6ea8031 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 3 Sep 2012 20:21:42 +0200
Subject: [PATCH] openssh: some fixes for systemd units, drop unused rdep.

---
 srcpkgs/openssh/files/sshd.service | 16 ++++++++--------
 srcpkgs/openssh/files/sshd.socket  |  3 ++-
 srcpkgs/openssh/template           |  3 +--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/openssh/files/sshd.service b/srcpkgs/openssh/files/sshd.service
index 5ce2f5c414..3cb8321f92 100644
--- a/srcpkgs/openssh/files/sshd.service
+++ b/srcpkgs/openssh/files/sshd.service
@@ -1,16 +1,16 @@
+# Note that this is the service file for running a single SSH server for all
+# incoming connections, suitable only for systems with a large amount of SSH
+# traffic. In almost all other cases it is a better idea to use sshd.socket +
+# sshd@.service (i.e. the on-demand spawning version for one instance per
+# connection).
+
 [Unit]
 Description=SSH Secure Shell Service
-After=syslog.target sshdgenkeys.service
+Wants=sshdgenkeys.service
+After=sshdgenkeys.service
 
 [Service]
 ExecStart=/usr/sbin/sshd -D
 
 [Install]
 WantedBy=multi-user.target
-Also=sshdgenkeys.service
-
-# Note that this is the service file for running a single SSH server for all
-# incoming connections, suitable only for systems with a large amount of SSH
-# traffic. In almost all other cases it is a better idea to use sshd.socket +
-# sshd@.service (i.e. the on-demand spawning version for one instance per
-# connection).
diff --git a/srcpkgs/openssh/files/sshd.socket b/srcpkgs/openssh/files/sshd.socket
index 6a67bfe864..fc0dc6708d 100644
--- a/srcpkgs/openssh/files/sshd.socket
+++ b/srcpkgs/openssh/files/sshd.socket
@@ -1,5 +1,7 @@
 [Unit]
 Conflicts=sshd.service
+Wants=sshdgenkeys.service
+After=sshdgenkeys.service
 
 [Socket]
 ListenStream=22
@@ -7,4 +9,3 @@ Accept=yes
 
 [Install]
 WantedBy=sockets.target
-Also=sshdgenkeys.service
diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 4a7973c0de..aa8e25164b 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,14 +1,13 @@
 # Template file for 'openssh'
 pkgname=openssh
 version=6.1p1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--without-tcp-wrappers --datadir=/usr/share/openssh
 --sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
 --with-mantype=man --without-rpath --with-xauth=/usr/bin/xauth
 --with-ssl-engine --disable-strip --with-privsep-path=/var/chroot/ssh
 --with-kerberos5=/usr --with-pid-dir=/run --with-pam"
-depends="shadow"
 replaces="openssh-client<6.1p1"
 makedepends="perl>=0 zlib-devel openssl-devel pam-devel mit-krb5-devel e2fsprogs-devel"
 conf_files="/etc/ssh/moduli /etc/ssh/ssh_config"