wok rev 25027

updated openssh, openssh-pam and sftp-server (8.7p1 -> 9.0p1)
author Hans-G?nter Theisgen
date Thu May 19 13:59:33 2022 +0100 (23 months ago)
parents 505d1daeed6c
children 22471cbea549
files openssh-pam/receipt openssh/description.txt openssh/receipt sftp-server/receipt
line diff
     1.1 --- a/openssh-pam/receipt	Thu May 19 10:39:49 2022 +0000
     1.2 +++ b/openssh-pam/receipt	Thu May 19 13:59:33 2022 +0100
     1.3 @@ -1,24 +1,27 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="openssh-pam"
     1.7 -VERSION="8.6p1"
     1.8 +VERSION="9.0p1"
     1.9  CATEGORY="security"
    1.10 +TAGS="ssh security"
    1.11  SHORT_DESC="Openbsd Secure Shell using PAM."
    1.12  MAINTAINER="pascal.bellard@slitaz.org"
    1.13  LICENSE="BSD"
    1.14 +WEB_SITE="https://www.openssh.com/"
    1.15 +
    1.16  SOURCE="openssh"
    1.17  TARBALL="$SOURCE-$VERSION.tar.gz"
    1.18 -WEB_SITE="http://www.openssh.org/"
    1.19 -WGET_URL="http://ftp.fr.openbsd.org/pub/OpenBSD/OpenSSH/portable/$TARBALL"
    1.20 +WGET_URL="https://ftp.fr.openbsd.org/pub/OpenBSD/OpenSSH/portable/$TARBALL"
    1.21 +
    1.22 +PROVIDE="openssh:pam ssh:pam"
    1.23 +SUGGESTED="gtk+"
    1.24 +DEPENDS="libcrypto pam sftp-server zlib"
    1.25 +BUILD_DEPENDS="gtk+-dev libcrypto-dev openssl-dev pam pam-dev zlib-dev"
    1.26 +
    1.27 +TAZPANEL_DAEMON="man::sshd|edit::/etc/ssh/sshd_config|options::OPENSSH_OPTIONS|web::$WEB_SITE"
    1.28 +
    1.29  CONFIG_FILES="/etc/ssh/*config /etc/ssh/moduli"
    1.30  SECRET_FILES="/etc/ssh/*key*"
    1.31 -TAGS="ssh security"
    1.32 -
    1.33 -PROVIDE="openssh:pam ssh:pam"
    1.34 -DEPENDS="sftp-server libcrypto zlib pam"
    1.35 -BUILD_DEPENDS="libcrypto-dev zlib-dev openssl-dev pam pam-dev gtk+-dev"
    1.36 -SUGGESTED="gtk+"
    1.37 -TAZPANEL_DAEMON="man::sshd|edit::/etc/ssh/sshd_config|options::OPENSSH_OPTIONS|web::$WEB_SITE"
    1.38  
    1.39  current_version()
    1.40  {
    1.41 @@ -30,20 +33,20 @@
    1.42  compile_rules()
    1.43  {
    1.44  	unset LD # for cross compiling with --disable-strip
    1.45 -	./configure \
    1.46 -		--prefix=/usr \
    1.47 -		--sysconfdir=/etc/ssh \
    1.48 -		--libexecdir=/usr/sbin \
    1.49 -		--with-privsep-user=nobody \
    1.50 -		--with-xauth=/usr/bin/xauth \
    1.51 -		--with-privsep-path=/var/run/sshd \
    1.52 -		--with-pam \
    1.53 -		--disable-strip \
    1.54 +	./configure					\
    1.55 +		--prefix=/usr				\
    1.56 +		--sysconfdir=/etc/ssh			\
    1.57 +		--libexecdir=/usr/sbin			\
    1.58 +		--with-privsep-user=nobody		\
    1.59 +		--with-xauth=/usr/bin/xauth		\
    1.60 +		--with-privsep-path=/var/run/sshd	\
    1.61 +		--with-pam				\
    1.62 +		--disable-strip				\
    1.63  		$CONFIGURE_ARGS &&
    1.64  	make STRIP_OPT="" &&
    1.65 -	make -j 1 DESTDIR=$DESTDIR install
    1.66 -	install -d -m 755 $DESTDIR/usr/share/doc &&
    1.67 -	install -m 644 $src/[A-Z][A-Z]* $DESTDIR/usr/share/doc
    1.68 +	make install -j 1 DESTDIR=$DESTDIR
    1.69 +	install -d -m 755		$DESTDIR/usr/share/doc &&
    1.70 +	install -m 644 $src/[A-Z][A-Z]*	$DESTDIR/usr/share/doc
    1.71  	cd contrib &&
    1.72  	cc -Wall $(pkg-config --cflags gtk+-2.0) gnome-ssh-askpass2.c \
    1.73  		-o gnome-ssh-askpass $(pkg-config --libs gtk+-2.0) -lX11 &&
    1.74 @@ -53,17 +56,23 @@
    1.75  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.76  genpkg_rules()
    1.77  {
    1.78 -	mkdir -p $fs/usr $fs/etc/init.d $fs/etc/ssh
    1.79 -	cp -a $install/usr/sbin $install/usr/bin $fs/usr
    1.80 -	rm -f $fs/usr/sbin/sftp-server
    1.81 -	install -D -m 755 -oroot -groot $src/contrib/sshd.pam.generic $fs/etc/pam.d/sshd
    1.82 -	install -m 755 -oroot -groot $src/contrib/ssh-copy-id $fs/usr/bin
    1.83 -	cp $src/contrib/ssh-copy-id.1 $install/usr/share/man/cat1
    1.84 -	cp -a $install/etc $fs
    1.85 -	cp ../$SOURCE/stuff/openssh $fs/etc/init.d
    1.86 +	mkdir -p $fs/usr
    1.87 +	mkdir -p $fs/etc/init.d
    1.88 +	mkdir -p $fs/etc/ssh
    1.89 +
    1.90 +	cp -a $install/usr/sbin		$fs/usr
    1.91 +	cp -a $install/usr/bin		$fs/usr
    1.92 +	rm -f				$fs/usr/sbin/sftp-server
    1.93 +	install -D -m 755 -oroot -groot $src/contrib/sshd.pam.generic \
    1.94 +					$fs/etc/pam.d/sshd
    1.95 +	install -m 755 -oroot -groot $src/contrib/ssh-copy-id \
    1.96 +					$fs/usr/bin
    1.97 +	cp $src/contrib/ssh-copy-id.1	$install/usr/share/man/cat1
    1.98 +	cp -a $install/etc		$fs
    1.99 +	cp ../$SOURCE/stuff/openssh	$fs/etc/init.d
   1.100  	sed -i 's/.*UsePAM.*/UsePAM yes/' $fs/etc/ssh/sshd_config
   1.101  	sed -i 's|/usr/libexec/sftp-server|/usr/sbin/sftp-server|' \
   1.102 -		$fs/etc/ssh/sshd_config
   1.103 +					$fs/etc/ssh/sshd_config
   1.104  
   1.105  	cat >> $fs/etc/ssh/ssh_config <<EOT
   1.106  
   1.107 @@ -83,13 +92,14 @@
   1.108  	grep -q ssh "$1/etc/inetd.conf" || cat >> "$1/etc/inetd.conf" <<EOT
   1.109  #ssh	stream	tcp	nowait	root	sshd	sshd	-i
   1.110  EOT
   1.111 -	while read dropbear openssh ; do
   1.112 +	while read dropbear openssh
   1.113 +	  do
   1.114  		[ -s "$1$dropbear" ] || continue
   1.115  		[ -s "$1$openssh" ] && continue
   1.116  		chroot "$1/" dropbearconvert dropbear openssh $dropbear $openssh
   1.117  		chroot "$1/" dropbearkey -y -f $dropbear | grep ssh > "$1$openssh.pub"
   1.118  		chroot "$1/" dropbearkey -y -f $dropbear | grep Fingerprint
   1.119 -	done <<EOT
   1.120 +	  done <<EOT
   1.121  /etc/dropbear/dropbear_rsa_host_key	/etc/ssh/ssh_host_rsa_key
   1.122  /etc/dropbear/dropbear_dss_host_key	/etc/ssh/ssh_host_dsa_key
   1.123  /etc/dropbear/dropbear_ecdsa_host_key	/etc/ssh/ssh_host_ecdsa_key
   1.124 @@ -101,5 +111,6 @@
   1.125  
   1.126  post_remove()
   1.127  {
   1.128 -	grep -q sshd "$1/etc/inetd.conf" && sed -i '/sshd/d' "$1/etc/inetd.conf"
   1.129 +	grep -q sshd "$1/etc/inetd.conf" &&
   1.130 +	sed -i '/sshd/d' "$1/etc/inetd.conf"
   1.131  }
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/openssh/description.txt	Thu May 19 13:59:33 2022 +0100
     2.3 @@ -0,0 +1,7 @@
     2.4 +OpenSSH is the premier connectivity tool for remote login
     2.5 +with the SSH protocol.
     2.6 +It encrypts all traffic to eliminate eavesdropping,
     2.7 +connection hijacking, and other attacks.
     2.8 +In addition, OpenSSH provides a large suite of secure
     2.9 +tunneling capabilities, several authentication methods,
    2.10 +and sophisticated configuration options.
     3.1 --- a/openssh/receipt	Thu May 19 10:39:49 2022 +0000
     3.2 +++ b/openssh/receipt	Thu May 19 13:59:33 2022 +0100
     3.3 @@ -1,25 +1,30 @@
     3.4  # SliTaz package receipt.
     3.5  
     3.6  PACKAGE="openssh"
     3.7 -VERSION="8.7p1"
     3.8 +VERSION="9.0p1"
     3.9  CATEGORY="security"
    3.10 +TAGS="ssh security"
    3.11  SHORT_DESC="Openbsd Secure Shell."
    3.12  MAINTAINER="pascal.bellard@slitaz.org"
    3.13  LICENSE="BSD"
    3.14 +WEB_SITE="https://www.openssh.com/"
    3.15 +
    3.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
    3.17 -WEB_SITE="http://www.openssh.org/"
    3.18  WGET_URL="https://ftp.fr.openbsd.org/pub/OpenBSD/OpenSSH/portable/$TARBALL"
    3.19 +
    3.20 +PROVIDE="ssh"
    3.21 +SUGGESTED="gtk+"
    3.22 +DEPENDS="libcrypto sftp-server zlib"
    3.23 +BUILD_DEPENDS="gtk+-dev libcrypto-dev openssl-dev zlib-dev"
    3.24 +SPLIT="sftp-server"
    3.25 +TAZPANEL_DAEMON="man::sshd|edit::/etc/ssh/sshd_config|options|web::$WEB_SITE"
    3.26 +
    3.27  CONFIG_FILES="/etc/ssh/*config /etc/ssh/moduli"
    3.28  SECRET_FILES="/etc/ssh/*key*"
    3.29 -TAGS="ssh security"
    3.30 +
    3.31  HOST_ARCH="i486 arm"
    3.32  
    3.33 -SPLIT="sftp-server"
    3.34 -PROVIDE="ssh"
    3.35 -DEPENDS="sftp-server libcrypto zlib"
    3.36 -BUILD_DEPENDS="libcrypto-dev zlib-dev openssl-dev gtk+-dev"
    3.37 -SUGGESTED="gtk+"
    3.38 -TAZPANEL_DAEMON="man::sshd|edit::/etc/ssh/sshd_config|options|web::$WEB_SITE"
    3.39 +# @maintainer:	Please update also sftp-server
    3.40  
    3.41  current_version()
    3.42  {
    3.43 @@ -31,38 +36,43 @@
    3.44  compile_rules()
    3.45  {
    3.46  	unset LD # for cross compiling with --disable-strip
    3.47 -	./configure \
    3.48 -		--prefix=/usr \
    3.49 -		--sysconfdir=/etc/ssh \
    3.50 -		--libexecdir=/usr/sbin \
    3.51 -		--with-privsep-user=nobody \
    3.52 -		--with-xauth=/usr/bin/xauth \
    3.53 -		--with-privsep-path=/var/run/sshd \
    3.54 -		--without-pam \
    3.55 -		--disable-strip \
    3.56 +	./configure					\
    3.57 +		--prefix=/usr				\
    3.58 +		--sysconfdir=/etc/ssh			\
    3.59 +		--libexecdir=/usr/sbin			\
    3.60 +		--with-privsep-user=nobody		\
    3.61 +		--with-xauth=/usr/bin/xauth		\
    3.62 +		--with-privsep-path=/var/run/sshd	\
    3.63 +		--without-pam				\
    3.64 +		--disable-strip				\
    3.65  		$CONFIGURE_ARGS &&
    3.66  	make STRIP_OPT="" &&
    3.67 -	make -j 1 DESTDIR=$DESTDIR install
    3.68 -	install -d -m 755 $DESTDIR/usr/share/doc &&
    3.69 -	install -m 644 $src/[A-Z][A-Z]* $DESTDIR/usr/share/doc
    3.70 +	make install -j 1 DESTDIR=$DESTDIR
    3.71 +	install -d -m 755		$DESTDIR/usr/share/doc &&
    3.72 +	install -m 644 $src/[A-Z][A-Z]*	$DESTDIR/usr/share/doc
    3.73  	cd contrib &&
    3.74  	cc -Wall $(pkg-config --cflags gtk+-2.0) gnome-ssh-askpass2.c \
    3.75  		-o gnome-ssh-askpass $(pkg-config --libs gtk+-2.0) -lX11 &&
    3.76 -	cp gnome-ssh-askpass $DESTDIR/usr/bin/ssh-askpass
    3.77 +	cp gnome-ssh-askpass		$DESTDIR/usr/bin/ssh-askpass
    3.78  }
    3.79  
    3.80  # Rules to gen a SliTaz package suitable for Tazpkg.
    3.81  genpkg_rules()
    3.82  {
    3.83 -	mkdir -p $fs/usr $fs/etc/init.d $fs/etc/ssh
    3.84 -	cp -a $install/usr/sbin $install/usr/bin $fs/usr
    3.85 -	rm -f $fs/usr/sbin/sftp-server
    3.86 -	install -m 755 -oroot -groot $src/contrib/ssh-copy-id $fs/usr/bin
    3.87 -	cp $src/contrib/ssh-copy-id.1 $install/usr/share/man/cat1
    3.88 -	cp -a $install/etc $fs
    3.89 -	cp $stuff/openssh $fs/etc/init.d
    3.90 +	mkdir -p $fs/usr
    3.91 +	mkdir -p $fs/etc/init.d
    3.92 +	mkdir -p $fs/etc/ssh
    3.93 +
    3.94 +	cp -a $install/usr/sbin		$fs/usr
    3.95 +	cp -a $install/usr/bin		$fs/usr
    3.96 +	rm -f				$fs/usr/sbin/sftp-server
    3.97 +	install -m 755 -oroot -groot $src/contrib/ssh-copy-id \
    3.98 +					$fs/usr/bin
    3.99 +	cp $src/contrib/ssh-copy-id.1	$install/usr/share/man/cat1
   3.100 +	cp -a $install/etc		$fs
   3.101 +	cp $stuff/openssh		$fs/etc/init.d
   3.102  	sed -i 's|/usr/libexec/sftp-server|/usr/sbin/sftp-server|' \
   3.103 -		$fs/etc/ssh/sshd_config
   3.104 +					$fs/etc/ssh/sshd_config
   3.105  
   3.106  	cat >> $fs/etc/ssh/ssh_config <<EOT
   3.107  
   3.108 @@ -79,16 +89,18 @@
   3.109  
   3.110  post_install()
   3.111  {
   3.112 -	grep -q ssh "$1/etc/inetd.conf" || cat >> "$1/etc/inetd.conf" <<EOT
   3.113 +	grep -q ssh "$1/etc/inetd.conf" ||
   3.114 +	cat >> "$1/etc/inetd.conf" <<EOT
   3.115  #ssh	stream	tcp	nowait	root	sshd	sshd	-i
   3.116  EOT
   3.117 -	while read dropbear openssh ; do
   3.118 +	while read dropbear openssh
   3.119 +	  do
   3.120  		[ -s "$1$dropbear" ] || continue
   3.121  		[ -s "$1$openssh" ] && continue
   3.122  		chroot "$1/" dropbearconvert dropbear openssh $dropbear $openssh
   3.123  		chroot "$1/" dropbearkey -y -f $dropbear | grep ssh > "$1$openssh.pub"
   3.124  		chroot "$1/" dropbearkey -y -f $dropbear | grep Fingerprint
   3.125 -	done <<EOT
   3.126 +	  done <<EOT
   3.127  /etc/dropbear/dropbear_rsa_host_key	/etc/ssh/ssh_host_rsa_key
   3.128  /etc/dropbear/dropbear_dss_host_key	/etc/ssh/ssh_host_dsa_key
   3.129  /etc/dropbear/dropbear_ecdsa_host_key	/etc/ssh/ssh_host_ecdsa_key
   3.130 @@ -100,5 +112,6 @@
   3.131  
   3.132  post_remove()
   3.133  {
   3.134 -	grep -q sshd "$1/etc/inetd.conf" && sed -i '/sshd/d' "$1/etc/inetd.conf"
   3.135 +	grep -q sshd "$1/etc/inetd.conf" &&
   3.136 +	sed -i '/sshd/d' "$1/etc/inetd.conf"
   3.137  }
     4.1 --- a/sftp-server/receipt	Thu May 19 10:39:49 2022 +0000
     4.2 +++ b/sftp-server/receipt	Thu May 19 13:59:33 2022 +0100
     4.3 @@ -1,19 +1,19 @@
     4.4  # SliTaz package receipt.
     4.5  
     4.6  PACKAGE="sftp-server"
     4.7 -VERSION="8.7p1"
     4.8 +VERSION="9.0p1"
     4.9  CATEGORY="security"
    4.10  TAGS="ssh"
    4.11  SHORT_DESC="Openbsd Secure FTP server."
    4.12  MAINTAINER="pascal.bellard@slitaz.org"
    4.13  LICENSE="BSD"
    4.14 -WEB_SITE="http://www.openssh.org/"
    4.15 +WEB_SITE="https://www.openssh.com/"
    4.16 +
    4.17 +HOST_ARCH="i486 arm"
    4.18  
    4.19  DEPENDS="libcrypto zlib"
    4.20  WANTED="openssh"
    4.21  
    4.22 -HOST_ARCH="i486 arm"
    4.23 -
    4.24  # Rules to gen a SliTaz package suitable for Tazpkg.
    4.25  genpkg_rules()
    4.26  {