wok diff openssh/receipt @ rev 25420

Update some web_site
author Pascal Bellard <pascal.bellard@slitaz.org>
date Mon Aug 08 07:39:58 2022 +0000 (22 months ago)
parents 549c0693b1a5
children 41581d281860
line diff
     1.1 --- a/openssh/receipt	Thu Sep 16 08:39:38 2021 +0000
     1.2 +++ b/openssh/receipt	Mon Aug 08 07:39:58 2022 +0000
     1.3 @@ -1,25 +1,30 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="openssh"
     1.7 -VERSION="8.7p1"
     1.8 +VERSION="9.0p1"
     1.9  CATEGORY="security"
    1.10 +TAGS="ssh security"
    1.11  SHORT_DESC="Openbsd Secure Shell."
    1.12  MAINTAINER="pascal.bellard@slitaz.org"
    1.13  LICENSE="BSD"
    1.14 +WEB_SITE="https://www.openssh.com/"
    1.15 +
    1.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
    1.17 -WEB_SITE="http://www.openssh.org/"
    1.18  WGET_URL="https://ftp.fr.openbsd.org/pub/OpenBSD/OpenSSH/portable/$TARBALL"
    1.19 +
    1.20 +PROVIDE="ssh"
    1.21 +SUGGESTED="gtk+"
    1.22 +DEPENDS="libcrypto sftp-server zlib"
    1.23 +BUILD_DEPENDS="gtk+-dev libcrypto-dev openssl-dev zlib-dev"
    1.24 +SPLIT="sftp-server"
    1.25 +TAZPANEL_DAEMON="man::sshd|edit::/etc/ssh/sshd_config|options|web::$WEB_SITE"
    1.26 +
    1.27  CONFIG_FILES="/etc/ssh/*config /etc/ssh/moduli"
    1.28  SECRET_FILES="/etc/ssh/*key*"
    1.29 -TAGS="ssh security"
    1.30 +
    1.31  HOST_ARCH="i486 arm"
    1.32  
    1.33 -SPLIT="sftp-server"
    1.34 -PROVIDE="ssh"
    1.35 -DEPENDS="sftp-server libcrypto zlib"
    1.36 -BUILD_DEPENDS="libcrypto-dev zlib-dev openssl-dev gtk+-dev"
    1.37 -SUGGESTED="gtk+"
    1.38 -TAZPANEL_DAEMON="man::sshd|edit::/etc/ssh/sshd_config|options|web::$WEB_SITE"
    1.39 +# @maintainer:	Please update also sftp-server
    1.40  
    1.41  current_version()
    1.42  {
    1.43 @@ -31,38 +36,43 @@
    1.44  compile_rules()
    1.45  {
    1.46  	unset LD # for cross compiling with --disable-strip
    1.47 -	./configure \
    1.48 -		--prefix=/usr \
    1.49 -		--sysconfdir=/etc/ssh \
    1.50 -		--libexecdir=/usr/sbin \
    1.51 -		--with-privsep-user=nobody \
    1.52 -		--with-xauth=/usr/bin/xauth \
    1.53 -		--with-privsep-path=/var/run/sshd \
    1.54 -		--without-pam \
    1.55 -		--disable-strip \
    1.56 +	./configure					\
    1.57 +		--prefix=/usr				\
    1.58 +		--sysconfdir=/etc/ssh			\
    1.59 +		--libexecdir=/usr/sbin			\
    1.60 +		--with-privsep-user=nobody		\
    1.61 +		--with-xauth=/usr/bin/xauth		\
    1.62 +		--with-privsep-path=/var/run/sshd	\
    1.63 +		--without-pam				\
    1.64 +		--disable-strip				\
    1.65  		$CONFIGURE_ARGS &&
    1.66  	make STRIP_OPT="" &&
    1.67 -	make -j 1 DESTDIR=$DESTDIR install
    1.68 -	install -d -m 755 $DESTDIR/usr/share/doc &&
    1.69 -	install -m 644 $src/[A-Z][A-Z]* $DESTDIR/usr/share/doc
    1.70 +	make install -j 1 DESTDIR=$DESTDIR
    1.71 +	install -d -m 755		$DESTDIR/usr/share/doc &&
    1.72 +	install -m 644 $src/[A-Z][A-Z]*	$DESTDIR/usr/share/doc
    1.73  	cd contrib &&
    1.74  	cc -Wall $(pkg-config --cflags gtk+-2.0) gnome-ssh-askpass2.c \
    1.75  		-o gnome-ssh-askpass $(pkg-config --libs gtk+-2.0) -lX11 &&
    1.76 -	cp gnome-ssh-askpass $DESTDIR/usr/bin/ssh-askpass
    1.77 +	cp gnome-ssh-askpass		$DESTDIR/usr/bin/ssh-askpass
    1.78  }
    1.79  
    1.80  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.81  genpkg_rules()
    1.82  {
    1.83 -	mkdir -p $fs/usr $fs/etc/init.d $fs/etc/ssh
    1.84 -	cp -a $install/usr/sbin $install/usr/bin $fs/usr
    1.85 -	rm -f $fs/usr/sbin/sftp-server
    1.86 -	install -m 755 -oroot -groot $src/contrib/ssh-copy-id $fs/usr/bin
    1.87 -	cp $src/contrib/ssh-copy-id.1 $install/usr/share/man/cat1
    1.88 -	cp -a $install/etc $fs
    1.89 -	cp $stuff/openssh $fs/etc/init.d
    1.90 +	mkdir -p $fs/usr
    1.91 +	mkdir -p $fs/etc/init.d
    1.92 +	mkdir -p $fs/etc/ssh
    1.93 +
    1.94 +	cp -a $install/usr/sbin		$fs/usr
    1.95 +	cp -a $install/usr/bin		$fs/usr
    1.96 +	rm -f				$fs/usr/sbin/sftp-server
    1.97 +	install -m 755 -oroot -groot $src/contrib/ssh-copy-id \
    1.98 +					$fs/usr/bin
    1.99 +	cp $src/contrib/ssh-copy-id.1	$install/usr/share/man/cat1
   1.100 +	cp -a $install/etc		$fs
   1.101 +	cp $stuff/openssh		$fs/etc/init.d
   1.102  	sed -i 's|/usr/libexec/sftp-server|/usr/sbin/sftp-server|' \
   1.103 -		$fs/etc/ssh/sshd_config
   1.104 +					$fs/etc/ssh/sshd_config
   1.105  
   1.106  	cat >> $fs/etc/ssh/ssh_config <<EOT
   1.107  
   1.108 @@ -79,16 +89,18 @@
   1.109  
   1.110  post_install()
   1.111  {
   1.112 -	grep -q ssh "$1/etc/inetd.conf" || cat >> "$1/etc/inetd.conf" <<EOT
   1.113 +	grep -q ssh "$1/etc/inetd.conf" ||
   1.114 +	cat >> "$1/etc/inetd.conf" <<EOT
   1.115  #ssh	stream	tcp	nowait	root	sshd	sshd	-i
   1.116  EOT
   1.117 -	while read dropbear openssh ; do
   1.118 +	while read dropbear openssh
   1.119 +	  do
   1.120  		[ -s "$1$dropbear" ] || continue
   1.121  		[ -s "$1$openssh" ] && continue
   1.122  		chroot "$1/" dropbearconvert dropbear openssh $dropbear $openssh
   1.123  		chroot "$1/" dropbearkey -y -f $dropbear | grep ssh > "$1$openssh.pub"
   1.124  		chroot "$1/" dropbearkey -y -f $dropbear | grep Fingerprint
   1.125 -	done <<EOT
   1.126 +	  done <<EOT
   1.127  /etc/dropbear/dropbear_rsa_host_key	/etc/ssh/ssh_host_rsa_key
   1.128  /etc/dropbear/dropbear_dss_host_key	/etc/ssh/ssh_host_dsa_key
   1.129  /etc/dropbear/dropbear_ecdsa_host_key	/etc/ssh/ssh_host_ecdsa_key
   1.130 @@ -100,5 +112,6 @@
   1.131  
   1.132  post_remove()
   1.133  {
   1.134 -	grep -q sshd "$1/etc/inetd.conf" && sed -i '/sshd/d' "$1/etc/inetd.conf"
   1.135 +	grep -q sshd "$1/etc/inetd.conf" &&
   1.136 +	sed -i '/sshd/d' "$1/etc/inetd.conf"
   1.137  }