Date: Saturday, June 9, 2012 @ 01:43:48 Author: bisson Revision: 161304
merge systemd files Added: openssh/trunk/sshd.service openssh/trunk/sshd.socket openssh/trunk/sshdgenkeys.service openssh/trunk/tmpfiles.d Modified: openssh/trunk/PKGBUILD ---------------------+ PKGBUILD | 31 ++++++++++++++++++++++++------- sshd.service | 19 +++++++++++++++++++ sshd.socket | 10 ++++++++++ sshdgenkeys.service | 18 ++++++++++++++++++ tmpfiles.d | 1 + 5 files changed, 72 insertions(+), 7 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-06-09 05:27:03 UTC (rev 161303) +++ PKGBUILD 2012-06-09 05:43:48 UTC (rev 161304) @@ -5,7 +5,7 @@ pkgname=openssh pkgver=6.0p1 -pkgrel=2 +pkgrel=3 pkgdesc='Free version of the SSH connectivity tools' url='http://www.openssh.org/portable.html' license=('custom:BSD') @@ -15,11 +15,21 @@ 'x11-ssh-askpass: input passphrase in X') source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"; 'sshd.close-sessions' + 'sshdgenkeys.service' + '[email protected]' + 'sshd.service' + 'sshd.socket' + 'tmpfiles.d' 'sshd.confd' 'sshd.pam' 'sshd') sha1sums=('f691e53ef83417031a2854b8b1b661c9c08e4422' '954bf1660aa32620c37034320877f4511b767ccb' + '6c71de2c2ca9622aa8e863acd94b135555e11125' + 'bd6eae36c7ef9efb7147778baad7858b81f2d660' + '83a257b8f6a62237383262cb0e2583e5609ddac0' + 'a30fb5fda6d0143345bae47684edaffb8d0a92a7' + 'b5cf44205e8f4365c00bfbee110d7c0e563627aa' 'ec102deb69cad7d14f406289d2fc11fee6eddbdd' '659e3ee95c269014783ff8b318c6f50bf7496fbd' 'ed36e3a522f619ff6b13e253526596e4cca11e9f') @@ -59,15 +69,22 @@ cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - install -Dm755 ../sshd "${pkgdir}"/etc/rc.d/sshd - install -Dm644 ../sshd.pam "${pkgdir}"/etc/pam.d/sshd - install -Dm644 ../sshd.confd "${pkgdir}"/etc/conf.d/sshd + rm "${pkgdir}"/usr/share/man/man1/slogin.1 + ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1.gz + install -Dm644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE" + + install -Dm644 ../sshdgenkeys.service "${pkgdir}"/usr/lib/systemd/system/sshdgenkeys.service + install -Dm644 ../[email protected] "${pkgdir}"/usr/lib/systemd/system/[email protected] + install -Dm644 ../sshd.service "${pkgdir}"/usr/lib/systemd/system/sshd.service + install -Dm644 ../sshd.socket "${pkgdir}"/usr/lib/systemd/system/sshd.socket + install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/openssh.conf + install -Dm755 ../sshd.close-sessions "${pkgdir}/etc/rc.d/functions.d/sshd-close-sessions" # FS#17389 + install -Dm644 ../sshd.confd "${pkgdir}"/etc/conf.d/sshd + install -Dm644 ../sshd.pam "${pkgdir}"/etc/pam.d/sshd + install -Dm755 ../sshd "${pkgdir}"/etc/rc.d/sshd - rm "${pkgdir}"/usr/share/man/man1/slogin.1 - ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1.gz - install -Dm755 contrib/findssl.sh "${pkgdir}"/usr/bin/findssl.sh install -Dm755 contrib/ssh-copy-id "${pkgdir}"/usr/bin/ssh-copy-id install -Dm644 contrib/ssh-copy-id.1 "${pkgdir}"/usr/share/man/man1/ssh-copy-id.1 Added: sshd.service =================================================================== --- sshd.service (rev 0) +++ sshd.service 2012-06-09 05:43:48 UTC (rev 161304) @@ -0,0 +1,19 @@ +[Unit] +Description=OpenSSH Daemon +After=sshdgenkeys.service + +[Service] +ExecStart=/usr/sbin/sshd -D +ExecReload=/bin/kill -HUP $MAINPID +KillMode=process +Restart=always + +[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 + +# [email protected] (i.e. the on-demand spawning version for one instance per +# connection). Added: sshd.socket =================================================================== --- sshd.socket (rev 0) +++ sshd.socket 2012-06-09 05:43:48 UTC (rev 161304) @@ -0,0 +1,10 @@ +[Unit] +Conflicts=sshd.service + +[Socket] +ListenStream=22 +Accept=yes + +[Install] +WantedBy=sockets.target +Also=sshdgenkeys.service Added: sshdgenkeys.service =================================================================== --- sshdgenkeys.service (rev 0) +++ sshdgenkeys.service 2012-06-09 05:43:48 UTC (rev 161304) @@ -0,0 +1,18 @@ +[Unit] +Description=SSH Key Generation +ConditionPathExists=|!/etc/ssh/ssh_host_key +ConditionPathExists=|!/etc/ssh/ssh_host_key.pub +ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key +ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key.pub +ConditionPathExists=|!/etc/ssh/ssh_host_dsa_key +ConditionPathExists=|!/etc/ssh/ssh_host_dsa_key.pub +ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key +ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key.pub + +[Service] +ExecStart=/usr/bin/ssh-keygen -A +Type=oneshot +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target Added: tmpfiles.d =================================================================== --- tmpfiles.d (rev 0) +++ tmpfiles.d 2012-06-09 05:43:48 UTC (rev 161304) @@ -0,0 +1 @@ +d /var/empty 0755 root root -
