Install systemd unit files.

Package-Manager: portage-2.2.0_alpha80_p2/cvs/Linux x86_64

6 files changed, 50 insertions, 10 deletions

diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index 5ee7949e95bf..fb2e9579dd6b 100644
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/openssh
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.430 2011/12/04 10:08:19 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.431 2011/12/14 19:52:12 mgorny Exp $
+
+  14 Dec 2011; Michał Górny <mgorny@gentoo.org> openssh-5.9_p1-r3.ebuild,
+  +files/sshd.service, +files/sshd.socket, +files/sshd_at.service:
+  Install systemd unit files.
 
   04 Dec 2011; Sven Wegener <swegener@gentoo.org> files/sshd.rc6,
   files/sshd.rc6.1, files/sshd.rc6.2:
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 4e8c22c54933..e07da733c22f 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX openssh-4.7_p1-GSSAPI-dns.patch 4494 RMD160 4e02e0a85c0e33c917ec8c22b4e1c173a9d7d79e SHA1 d8a81eb92a49763106cfa5b319c22c6f188508ef SHA256 88a08f349258d4be5b2faa838a89fe1aa0196502990b745ac0e3a70dda30a0d7
 AUX openssh-5.2_p1-autoconf.patch 386 RMD160 8e57ae97df0b2483f826a7aba00bc0622b9a28f8 SHA1 22c4e40f54f97f866b460fe8987eb16363410caf SHA256 42bb5f23f02241186abd6158ac15cd1fba0fadb4bd79e6b051fbd05605419ebb
@@ -21,6 +21,9 @@ AUX sshd.rc6 2189 RMD160 1eced6306aa17094da80dba9259a5b7c2a071ea8 SHA1 42f528dc5
 AUX sshd.rc6.1 2270 RMD160 5c81454773e5c17c386fe8ad29d28b9048b9a6f6 SHA1 ae183a58f07af37f4c1c2ea46d0d7b83ab70c03d SHA256 153119116208d328c496d29b7cb9f85991df93020cc50c83b05ed498b10a2126
 AUX sshd.rc6.2 2069 RMD160 92a457dcd2dcfac5453956a76a1be9df66b38313 SHA1 74d0fdf9bf52ddd700a6eadd459ab56d48ad385c SHA256 94b1fc0d608464fd4a6c7ed23f0b9c44aada3404982d8fd25b8bfe202baffaa6
 AUX sshd.rc6.3 2057 RMD160 800875a8e8c61d8453033c7b069d0b0268f8a8fd SHA1 15d6d486749fade1e8bfb219f3226fb119f8b6e2 SHA256 43d95b495440ed6b3c1eb82b81712d7f6e58246527605c11d733cb5eb5523254
+AUX sshd.service 206 RMD160 c4942b6dac3a334ecee7a8ebe9bbb2b4b3918da2 SHA1 f8180cdbf17213c7535ae2c97cab4047149e07bd SHA256 093d4f526e740cbec46ad6a69207407daf01e74da44599d75b979f294c9b0a7b
+AUX sshd.socket 136 RMD160 c237a8fde92ae5e8528db59cf28e0018ba8086a5 SHA1 33a73159bce16bb87b2395a8d74605e53693d4f6 SHA256 c055abcd10c5d372119cbc3708661ddffccdee7a1de1282559c54d03e2f109d9
+AUX sshd_at.service 176 RMD160 e8a795680a2836d5f228848707a0ad128cd1a2a6 SHA1 d56d13de4f60dd3e633bd7f5e4079ce86c18a77f SHA256 332f5ffc30456fe2494095c2aabd1e6e02075ce224e2d49708ac7ccf6d341998
 DIST openssh-5.4p1-hpn13v7-x509variant.diff.gz 22941 RMD160 383b3883984ee0e6068363fdd645d2dd24c7964c SHA1 d3f04c938ab6e5e10587d0ffb717af37360a8dd6 SHA256 c2b1a81c6952ae73cc4dfd1528d560588c45cf1242ea8b0e6eadb0cc83b50377
 DIST openssh-5.5p1+x509-6.2.3.diff.gz 156737 RMD160 cf6d9e5f51512b3e22a3561ff7e1c6daad80d016 SHA1 5f163b03b3086605d9759b76565e6f3a5fa8cb85 SHA256 a2fdf904c21036fe6ee89da7572a37f4763ef414348f9a953c7c7e0fb3562a7f
 DIST openssh-5.5p1-hpn13v9.diff.gz 22657 RMD160 bb9d44589018030fa3102898f85f4dfd7032d2f0 SHA1 8601fabf0067ff9c59501dc0006ad3853dbb3de0 SHA256 0556ad75cbd29cba71263a5b7ddc44c03d17c09297a6c41a16d39d3549e5079c
@@ -50,13 +53,15 @@ EBUILD openssh-5.7_p1-r1.ebuild 8216 RMD160 6c2f5ee20c52126855130ac6f0f45e229cd4
 EBUILD openssh-5.8_p1-r1.ebuild 8431 RMD160 b4ab448d64511e1e0d5ca166b12ec0bfec343195 SHA1 8d40aed07dd7de318975940cb5f9fb820fb42ad8 SHA256 e83ca76abe80a5b2e15ec923e8eec2282f5a46327302251cec15a3223bc6322b
 EBUILD openssh-5.8_p2-r1.ebuild 8464 RMD160 2d5aec103a6683b2ae7d45016ece52fb582a0cda SHA1 232cc8de1521d2a9be8dc03530952cf8bad8bf90 SHA256 2f9b20192aeb1169ad48ffcf1a084064bbe6c978a0e7faf3abfb6fd5705d9a6c
 EBUILD openssh-5.8_p2.ebuild 8461 RMD160 bd31e8938815ddfba3d5844ba4c674f81b101fee SHA1 cae34fbf036adb349ef2e555677845d45f24398c SHA256 70ea3b105f069033d0872aa3c3d9252afdb11b79a61dbf5ca4d02c79488a0d5e
-EBUILD openssh-5.9_p1-r3.ebuild 8805 RMD160 c962e60bf28684182c81a9ad70b02914fae84b3e SHA1 b39f7b2207e4afbc5a44fb293bb0bc5d88761811 SHA256 6b6431bda2957754a63b0b8925356e73bb6f691fedee8eb2adf65787d8cd08d2
-MISC ChangeLog 68329 RMD160 05baafc92f341947c732d792210227c4cb306b1f SHA1 9449f638626b52e281f2ed31293cfbdaa11e469f SHA256 2f58f7ec18e86bf0a8a18b757ab3441c0c4a772f0e5f96199de6a70073aded91
+EBUILD openssh-5.9_p1-r3.ebuild 8943 RMD160 47be0be780b78d5d7ac69bef4e442f3e9fce89c9 SHA1 27502d21e6339caacc71329e21f4a2813955c35e SHA256 c667b38e23b711550c616a3b6263e0320fa19abd9b04a0a6aee227a53128f272
+MISC ChangeLog 68501 RMD160 1b78743212aa37e526520d7cd848f564946dce87 SHA1 8eb98543d7a75b3e3020be6925635de9d4782ba0 SHA256 493b8f2a227d03d7fc4822e927832e8069f98e22f371e48e4b57d6da0fa2698a
 MISC metadata.xml 1599 RMD160 31fdd1531a4111aa437882680029451b29ddf4aa SHA1 af53a6887ebf563150184ab40b4cc018ab4e4d3f SHA256 fddc51b98b6831f5bc0f1f5fdeb78c064f9c40fc5c9a9f31ec816890e6aade86
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7bRpgACgkQI1lqEGTUzyTiHACeIfIwvA/6xa0Td9V42P3waAKw
-RC0AoLNZzv9CO/pNq3AoB2lsdEx5fFX4
-=qIv9
+iJwEAQEIAAYFAk7o/qkACgkQfXuS5UK5QB3bogP/RTFLTQlccKqgg1iRqio2BelO
+TFPzSm439thDhWsfotFm+cyazRcBLMYsRPxszHYIF6IiKUVDhyhIvp0t/Iaw+C12
+gD3ZG2UchgVIvCrWDcF6H1ZB8M1pvjtPx/sJNcxClo+mm/vac6Ejl04qr009QcZH
+k1HuyNVQ0lShZcVc2cA=
+=vqn7
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openssh/files/sshd.service b/net-misc/openssh/files/sshd.service
new file mode 100644
index 000000000000..45f823ac1ef9
--- /dev/null
+++ b/net-misc/openssh/files/sshd.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=OpenSSH server daemon
+After=syslog.target network.target auditd.service
+
+[Service]
+ExecStart=/usr/sbin/sshd -D -e
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/openssh/files/sshd.socket b/net-misc/openssh/files/sshd.socket
new file mode 100644
index 000000000000..94b9533180da
--- /dev/null
+++ b/net-misc/openssh/files/sshd.socket
@@ -0,0 +1,10 @@
+[Unit]
+Description=OpenSSH Server Socket
+Conflicts=sshd.service
+
+[Socket]
+ListenStream=22
+Accept=yes
+
+[Install]
+WantedBy=sockets.target
diff --git a/net-misc/openssh/files/sshd_at.service b/net-misc/openssh/files/sshd_at.service
new file mode 100644
index 000000000000..2645ad047cc6
--- /dev/null
+++ b/net-misc/openssh/files/sshd_at.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=OpenSSH per-connection server daemon
+After=syslog.target auditd.service
+
+[Service]
+ExecStart=-/usr/sbin/sshd -i -e
+StandardInput=socket
+StandardError=syslog
diff --git a/net-misc/openssh/openssh-5.9_p1-r3.ebuild b/net-misc/openssh/openssh-5.9_p1-r3.ebuild
index 257a08ab1ed8..a929a984e85d 100644
--- a/net-misc/openssh/openssh-5.9_p1-r3.ebuild
+++ b/net-misc/openssh/openssh-5.9_p1-r3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.9_p1-r3.ebuild,v 1.4 2011/11/26 07:33:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.9_p1-r3.ebuild,v 1.5 2011/12/14 19:52:12 mgorny Exp $
 
 EAPI="2"
-inherit eutils flag-o-matic multilib autotools pam
+inherit eutils flag-o-matic multilib autotools pam systemd
 
 # Make it more portable between straight releases
 # and _p? releases.
@@ -206,6 +206,9 @@ src_install() {
 
 	diropts -m 0700
 	dodir /etc/skel/.ssh
+
+	systemd_dounit "${FILESDIR}"/sshd.{service,socket} || die
+	systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service' || die
 }
 
 src_test() {