wok diff tinyssh/receipt @ rev 25463

Up expat (2.4.9) fixes CVE-2022-40674
author Pascal Bellard <pascal.bellard@slitaz.org>
date Thu Sep 29 20:05:23 2022 +0000 (20 months ago)
parents f08fe4855be4
children 0262035dc1e7
line diff
     1.1 --- a/tinyssh/receipt	Thu Jun 10 07:14:38 2021 +0000
     1.2 +++ b/tinyssh/receipt	Thu Sep 29 20:05:23 2022 +0000
     1.3 @@ -1,17 +1,18 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="tinyssh"
     1.7 -VERSION="20210601"
     1.8 +VERSION="20220311"
     1.9  CATEGORY="network"
    1.10  SHORT_DESC="A small SSH server."
    1.11  MAINTAINER="pascal.bellard@slitaz.org"
    1.12  LICENSE="PublicDomain"
    1.13  WEB_SITE="https://tinyssh.org/"
    1.14 -SUGGESTED="tinyssh-keyconvert"
    1.15  
    1.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
    1.17  WGET_URL="https://github.com/janmojzis/tinyssh/archive/$VERSION.tar.gz"
    1.18  
    1.19 +SUGGESTED="tinyssh-keyconvert"
    1.20 +
    1.21  SECRET_FILES="/etc/tinyssh/sshkeydir"
    1.22  
    1.23  current_version()
    1.24 @@ -24,7 +25,7 @@
    1.25  compile_rules()
    1.26  {
    1.27  	make &&
    1.28 -	make DESTDIR=$DESTDIR install
    1.29 +	make install DESTDIR=$DESTDIR
    1.30  }
    1.31  
    1.32  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.33 @@ -34,17 +35,19 @@
    1.34  	mkdir -p $fs/usr
    1.35  
    1.36  	cp -a $install/usr/sbin $fs/usr
    1.37 -	for i in $fs/usr/sbin/tinysshd-*; do
    1.38 +	for i in $fs/usr/sbin/tinysshd-*
    1.39 +	  do
    1.40  		#cmp $fs/usr/sbin/tinysshd $i &&
    1.41  		ln -f $fs/usr/sbin/tinysshd $i
    1.42 -	done 
    1.43 +	  done 
    1.44  }
    1.45  
    1.46  post_install()
    1.47  {
    1.48  	[ -d $1/etc/tinyssh/sshkeydir ] ||
    1.49  	chroot $1/ tinysshd-makekey /etc/tinyssh/sshkeydir
    1.50 -	grep -q ^ssh $1/etc/inetd.conf || cat >> $1/etc/inetd.conf <<EOT
    1.51 +	grep -q ^ssh $1/etc/inetd.conf ||
    1.52 +	cat >> $1/etc/inetd.conf <<EOT
    1.53  ssh stream tcp nowait root /usr/sbin/tinysshd tinysshd -s -o -l -v /etc/tinyssh/sshkeydir -x sftp=/usr/sbin/sftp-server
    1.54  EOT
    1.55  }