diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-17 14:31:18 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-17 14:31:18 -0300 |
commit | 545a4c749d49c3fddbc57c157d650b194e2193d8 (patch) | |
tree | 7b06384a2d1d1ec07e26eda99bb0016a0540cbfc /core | |
parent | 40df5bbde7fc547479b2cede1f3ffb8e268816b3 (diff) | |
parent | 1fcb176285908c33aca3b0f5cb703ec098e5440c (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
multilib/wine/PKGBUILD
multilib/zsnes/PKGBUILD
testing/frozen-bubble/PKGBUILD
testing/perl-sdl/PKGBUILD
Diffstat (limited to 'core')
-rw-r--r-- | core/openssh/PKGBUILD | 6 | ||||
-rw-r--r-- | core/openssh/sshd.pam | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/core/openssh/PKGBUILD b/core/openssh/PKGBUILD index 54a6420d2..6c6ef616d 100644 --- a/core/openssh/PKGBUILD +++ b/core/openssh/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 127348 2011-06-13 11:08:41Z bisson $ +# $Id: PKGBUILD 127399 2011-06-14 16:51:03Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=openssh pkgver=5.8p2 -pkgrel=7 +pkgrel=8 pkgdesc='Free version of the SSH connectivity tools' arch=('i686' 'x86_64' 'mips64el') license=('custom:BSD') @@ -20,7 +20,7 @@ source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver} sha1sums=('64798328d310e4f06c9f01228107520adbc8b3e5' '3669cb5ca6149f69015df5ce8e60b82c540eb0a4' 'ec102deb69cad7d14f406289d2fc11fee6eddbdd' - '660092c57bde28bed82078f74011f95fc51c2293' + '07fecd5880b1c4fdd8c94ddb2e89ddce88effdc1' '6b7f8ebf0c1cc37137a7d9a53447ac8a0ee6a2b5') build() { diff --git a/core/openssh/sshd.pam b/core/openssh/sshd.pam index ae028ceb5..ff8829fe9 100644 --- a/core/openssh/sshd.pam +++ b/core/openssh/sshd.pam @@ -8,3 +8,4 @@ account required pam_time.so password required pam_unix.so session required pam_unix_session.so session required pam_limits.so +-session optional pam_ck_connector.so nox11 |