diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-10-25 18:46:01 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-10-25 18:46:01 +0200 |
commit | 5833e11252fe4cc8a98860d8058eb9a5e468ee70 (patch) | |
tree | 2a9f6051350e5ded403cf65e81324e10f041827a /core/openssh | |
parent | aa59a87bb8860445bb3a4b233b44812b65b8c363 (diff) | |
parent | a3b55a0c47a00ac40bc00a4ce87d93f809273840 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/cegui/PKGBUILD
community-testing/darktable/PKGBUILD
community-testing/freewrl/PKGBUILD
community-testing/gambas3/PKGBUILD
community-testing/gource/PKGBUILD
community-testing/luminancehdr/PKGBUILD
community-testing/luxrays/PKGBUILD
community-testing/luxrender/PKGBUILD
community-testing/megaglest/PKGBUILD
community-testing/openimageio/PKGBUILD
community-testing/performous/PKGBUILD
community-testing/projectm/PKGBUILD
community-testing/rss-glx/PKGBUILD
community-testing/sfml/PKGBUILD
community-testing/spring/PKGBUILD
community-testing/supertux/PKGBUILD
community-testing/widelands/PKGBUILD
community-testing/xbmc/PKGBUILD
community-testing/xbmc/xbmc.install
community/plan9port/PKGBUILD
community/v8/PKGBUILD
multilib/dev86/PKGBUILD
testing/binutils/PKGBUILD
testing/bzflag/PKGBUILD
testing/calligra/PKGBUILD
testing/cinepaint/PKGBUILD
testing/coreutils/PKGBUILD
testing/enblend-enfuse/PKGBUILD
testing/gcc/PKGBUILD
testing/gegl/PKGBUILD
testing/glew/PKGBUILD
testing/glibc/PKGBUILD
testing/glibc/glibc.install
testing/glibc/nscd.service
testing/gnome-documents/PKGBUILD
testing/hugin/PKGBUILD
testing/inkscape/PKGBUILD
testing/opencv/PKGBUILD
testing/systemd/PKGBUILD
testing/systemd/systemd.install
testing/tracker/PKGBUILD
testing/transcode/PKGBUILD
testing/transcode/ffmpeg-0.11.patch
testing/xf86-video-nouveau/PKGBUILD
testing/xine-lib/PKGBUILD
Diffstat (limited to 'core/openssh')
-rw-r--r-- | core/openssh/PKGBUILD | 10 | ||||
-rw-r--r-- | core/openssh/sshd.service | 1 | ||||
-rw-r--r-- | core/openssh/sshd.socket | 1 | ||||
-rw-r--r-- | core/openssh/sshdgenkeys.service | 3 |
4 files changed, 5 insertions, 10 deletions
diff --git a/core/openssh/PKGBUILD b/core/openssh/PKGBUILD index 6d3313bfe..d7d4ce5bd 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 |