diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-29 12:36:05 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-29 12:36:05 -0300 |
| commit | 6f36350b7b59dd4ccea3dd878938dd47b77a1608 (patch) | |
| tree | 6e81bc69d8bba80912b0f7f9224f82bda2d96792 /core/openssh | |
| parent | e40531aab32ff93b1f9da20d8a43a440d8dffaca (diff) | |
| parent | 83c3c42a38bda36bdc56d594318958bc4cfd9b32 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/percona-server/PKGBUILD
community/qdevelop/PKGBUILD
core/openssh/PKGBUILD
extra/colord/PKGBUILD
extra/enblend-enfuse/PKGBUILD
extra/mesa/PKGBUILD
extra/telepathy-kde-contact-list/PKGBUILD
extra/vim/PKGBUILD
multilib/lib32-mesa/PKGBUILD
Diffstat (limited to 'core/openssh')
| -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 af1f711ec..9b97d4c04 100644 --- a/core/openssh/PKGBUILD +++ b/core/openssh/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 140826 2011-10-19 22:29:31Z bisson $ +# $Id: PKGBUILD 143647 2011-11-28 00:51:52Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=openssh pkgver=5.9p1 -pkgrel=4.1 +pkgrel=5 pkgdesc='Free version of the SSH connectivity tools' arch=('i686' 'x86_64' 'mips64el') license=('custom:BSD') @@ -19,7 +19,7 @@ source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver} 'sshd') sha1sums=('ac4e0055421e9543f0af5da607a72cf5922dcc56' 'ec102deb69cad7d14f406289d2fc11fee6eddbdd' - '07fecd5880b1c4fdd8c94ddb2e89ddce88effdc1' + '3413909fd45a28701c92e6e5b59c6b65346ddb0f' '21fa88de6cc1c7912e71655f50896ba17991a1c2') build() { diff --git a/core/openssh/sshd.pam b/core/openssh/sshd.pam index ff8829fe9..c7b91cdfb 100644 --- a/core/openssh/sshd.pam +++ b/core/openssh/sshd.pam @@ -9,3 +9,4 @@ password required pam_unix.so session required pam_unix_session.so session required pam_limits.so -session optional pam_ck_connector.so nox11 +-session optional pam_systemd.so |