From c4fa245504a32b0bd65f5affe0cef43f5d2e1a59 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 20 Jul 2013 07:01:51 +0200 Subject: [PATCH] openssh: remove obsolete argument in sshd.pam for systemd>=205. --- srcpkgs/openssh/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template index d445c0fc714..d5ffb33ee27 100644 --- a/srcpkgs/openssh/template +++ b/srcpkgs/openssh/template @@ -1,7 +1,7 @@ # Template file for 'openssh' pkgname=openssh version=6.2p2 -revision=1 +revision=2 build_style=gnu-configure configure_args="--without-tcp-wrappers --datadir=/usr/share/openssh --sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody @@ -10,7 +10,7 @@ configure_args="--without-tcp-wrappers --datadir=/usr/share/openssh --with-pid-dir=/run --with-pam LD=$CC" hostmakedepends="perl" makedepends="zlib-devel openssl-devel pam-devel mit-krb5-devel" -short_desc="The OpenSSH implementation of SSH protocol versions 1 and 2 (client)" +short_desc="The OpenSSH implementation of SSH protocol" maintainer="Juan RP " homepage="http://www.openssh.org" license="BSD" @@ -37,7 +37,7 @@ post_install() { ${DESTDIR}/etc/ssh/sshd_config # Enable pam_systemd.so by default. - printf "session \trequired \tpam_systemd.so \tkill-session-processes=1\n" >> \ + printf "session\trequired\tpam_systemd.so\n" >> \ ${DESTDIR}/etc/pam.d/sshd } @@ -45,7 +45,7 @@ openssh-server_package() { conf_files="/etc/ssh/sshd_config /etc/pam.d/sshd" make_dirs="/var/chroot/ssh 0755 root root" depends="openssh>=$version" - short_desc="The OpenSSH server" + short_desc+=" - server" pkg_install() { vmove usr/libexec/sftp-server vmove etc/ssh/sshd_config @@ -62,6 +62,7 @@ openssh-server_package() { } openssh_package() { + short_desc+=" - client" replaces="openssh-client<6.1p1" conf_files="/etc/ssh/moduli /etc/ssh/ssh_config" pkg_install() {