wok-current rev 16754

openssh: fix xauth path
author Pascal Bellard <pascal.bellard@slitaz.org>
date Mon Jun 16 10:50:45 2014 +0200 (2014-06-16)
parents cc59f73ce42d
children facb8d1d8c91
files openssh-pam/receipt openssh/receipt
line diff
     1.1 --- a/openssh-pam/receipt	Mon Jun 16 10:29:38 2014 +0200
     1.2 +++ b/openssh-pam/receipt	Mon Jun 16 10:50:45 2014 +0200
     1.3 @@ -22,6 +22,7 @@
     1.4  	cd $src
     1.5  	./configure --prefix=/usr --sysconfdir=/etc/ssh --with-pam \
     1.6  		--with-privsep-user=nobody --with-privsep-path=/var/run/sshd \
     1.7 +		--with-xauth=/usr/bin/xauth \
     1.8  		--libexecdir=/usr/sbin \
     1.9  		$CONFIGURE_ARGS &&
    1.10  	make &&
    1.11 @@ -41,12 +42,12 @@
    1.12  
    1.13  post_install()
    1.14  {
    1.15 -       [ "$1" ] || while read dropbear openssh ; do
    1.16 -		[ -s $dropbear ] || continue
    1.17 +	while read dropbear openssh ; do
    1.18 +		[ -s $1$dropbear ] || continue
    1.19  		dropbearconvert dropbear openssh $1$dropbear $1$openssh
    1.20  		dropbearkey -y -f $1$dropbear | grep ssh > $1$openssh.pub
    1.21  		dropbearkey -y -f $1$dropbear | grep Fingerprint
    1.22 -       done <<EOT
    1.23 +	done <<EOT
    1.24  /etc/dropbear/dropbear_rsa_host_key	/etc/ssh/ssh_host_rsa_key
    1.25  /etc/dropbear/dropbear_dss_host_key	/etc/ssh/ssh_host_dsa_key
    1.26  EOT
     2.1 --- a/openssh/receipt	Mon Jun 16 10:29:38 2014 +0200
     2.2 +++ b/openssh/receipt	Mon Jun 16 10:50:45 2014 +0200
     2.3 @@ -26,6 +26,7 @@
     2.4  		--sysconfdir=/etc/ssh \
     2.5  		--libexecdir=/usr/sbin \
     2.6  		--with-privsep-user=nobody \
     2.7 +		--with-xauth=/usr/bin/xauth \
     2.8  		--with-privsep-path=/var/run/sshd \
     2.9  		--without-pam \
    2.10  		--disable-strip \