diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-02 12:00:40 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-02 12:00:40 +0200 |
| commit | c2ef76f233a03e87ba6f2a39ca06d6c8411525bd (patch) | |
| tree | 443d415b43358dbcc1043b51f3299d3b07ee3c73 /core/openssh | |
| parent | 3bcb803af0dd81dc1d1e3352d8dee1d731d33abb (diff) | |
| parent | defe74c9cba07c321ad2869d8f6872e64a167324 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/open-vm-tools/PKGBUILD
community-testing/open-vm-tools/vmware-guestd
extra/exo/PKGBUILD
extra/gnome-python-desktop/PKGBUILD
extra/imagemagick/PKGBUILD
extra/libindi/PKGBUILD
extra/libxfce4util/PKGBUILD
extra/terminal/PKGBUILD
extra/xfburn/PKGBUILD
extra/xfce4-appfinder/PKGBUILD
extra/xfce4-dev-tools/PKGBUILD
extra/xfce4-mailwatch-plugin/PKGBUILD
extra/xfce4-notifyd/PKGBUILD
extra/xfce4-panel/PKGBUILD
extra/xfce4-screenshooter/PKGBUILD
extra/xfce4-settings/PKGBUILD
extra/xfce4-smartbookmark-plugin/PKGBUILD
extra/xfce4-weather-plugin/PKGBUILD
testing/cairo/PKGBUILD
testing/lvm2/PKGBUILD
testing/openmpi/PKGBUILD
testing/udev/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 49bc64e2f..588010b9a 100644 --- a/core/openssh/PKGBUILD +++ b/core/openssh/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 157127 2012-04-24 08:19:54Z bisson $ +# $Id: PKGBUILD 157930 2012-04-30 06:17:08Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=openssh pkgver=6.0p1 -pkgrel=1 +pkgrel=2 pkgdesc='Free version of the SSH connectivity tools' url='http://www.openssh.org/portable.html' license=('custom:BSD') @@ -20,7 +20,7 @@ source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver} sha1sums=('f691e53ef83417031a2854b8b1b661c9c08e4422' '954bf1660aa32620c37034320877f4511b767ccb' 'ec102deb69cad7d14f406289d2fc11fee6eddbdd' - '3413909fd45a28701c92e6e5b59c6b65346ddb0f' + '659e3ee95c269014783ff8b318c6f50bf7496fbd' '21fa88de6cc1c7912e71655f50896ba17991a1c2') backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 'etc/conf.d/sshd') diff --git a/core/openssh/sshd.pam b/core/openssh/sshd.pam index c7b91cdfb..aeef8be27 100644 --- a/core/openssh/sshd.pam +++ b/core/openssh/sshd.pam @@ -8,5 +8,6 @@ account required pam_time.so password required pam_unix.so session required pam_unix_session.so session required pam_limits.so +session optional pam_loginuid.so -session optional pam_ck_connector.so nox11 -session optional pam_systemd.so |