wok diff openssh-pam/receipt @ 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 (24 months ago)
parents 7bea68e23e6b
children 41581d281860
line diff
     1.1 --- a/openssh-pam/receipt	Mon May 10 20:32:02 2021 +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  }