summaryrefslogtreecommitdiff
path: root/core/openssh
diff options
context:
space:
mode:
Diffstat (limited to 'core/openssh')
-rw-r--r--core/openssh/PKGBUILD10
-rw-r--r--core/openssh/sshd.service1
-rw-r--r--core/openssh/sshd.socket1
-rw-r--r--core/openssh/sshdgenkeys.service3
4 files changed, 5 insertions, 10 deletions
diff --git a/core/openssh/PKGBUILD b/core/openssh/PKGBUILD
index c3f6f519b..7202c9124 100644
--- a/core/openssh/PKGBUILD
+++ b/core/openssh/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 166025 2012-09-04 14:40:23Z bisson $
+# $Id: PKGBUILD 169626 2012-10-24 23:47:29Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Aaron Griffin <aaron@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=openssh
pkgver=6.1p1
-pkgrel=2
+pkgrel=3
pkgdesc='Free version of the SSH connectivity tools'
url='http://www.openssh.org/portable.html'
license=('custom:BSD')
@@ -25,10 +25,10 @@ source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}
'sshd')
sha1sums=('751c92c912310c3aa9cadc113e14458f843fc7b3'
'954bf1660aa32620c37034320877f4511b767ccb'
- '6c71de2c2ca9622aa8e863acd94b135555e11125'
+ '6df5be396f8c593bb511a249a1453294d18a01a6'
'bd6eae36c7ef9efb7147778baad7858b81f2d660'
- '1fd209980ee2fcdd7b219883e8add0f5ca63388a'
- 'b7acfce018efc111e7ce80dbe37b932caf7c2d53'
+ 'f9af4a442b804ab661cec0edb25dd76dee16d8d2'
+ 'e12fa910b26a5634e5a6ac39ce1399a132cf6796'
'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
'659e3ee95c269014783ff8b318c6f50bf7496fbd'
'1488d4ed33cf3037accf4b0e1c7a7e90b6a097c7')
diff --git a/core/openssh/sshd.service b/core/openssh/sshd.service
index b5c098b73..633164e5d 100644
--- a/core/openssh/sshd.service
+++ b/core/openssh/sshd.service
@@ -11,7 +11,6 @@ Restart=always
[Install]
WantedBy=multi-user.target
-Also=sshdgenkeys.service
# This service file runs an SSH daemon that forks for each incoming connection.
# If you prefer to spawn on-demand daemons, use sshd.socket and sshd@.service.
diff --git a/core/openssh/sshd.socket b/core/openssh/sshd.socket
index 1b9403c99..e09e32869 100644
--- a/core/openssh/sshd.socket
+++ b/core/openssh/sshd.socket
@@ -8,4 +8,3 @@ Accept=yes
[Install]
WantedBy=sockets.target
-Also=sshdgenkeys.service
diff --git a/core/openssh/sshdgenkeys.service b/core/openssh/sshdgenkeys.service
index 47c1c3fd6..8c27d7110 100644
--- a/core/openssh/sshdgenkeys.service
+++ b/core/openssh/sshdgenkeys.service
@@ -13,6 +13,3 @@ ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key.pub
ExecStart=/usr/bin/ssh-keygen -A
Type=oneshot
RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target