wok rev 25806

dropbear: inserted disable-lastlog for configure
author Hans-Günter Theisgen
date Fri Dec 13 16:03:39 2024 +0100 (8 months ago)
parents 6ef924cbceb1
children b2c66a389e93
files dropbear-pam/receipt dropbear/description.txt dropbear/receipt
line diff
     1.1 --- a/dropbear-pam/receipt	Wed Nov 13 15:24:31 2024 +0100
     1.2 +++ b/dropbear-pam/receipt	Fri Dec 13 16:03:39 2024 +0100
     1.3 @@ -3,21 +3,21 @@
     1.4  PACKAGE="dropbear-pam"
     1.5  VERSION="2024.86"
     1.6  CATEGORY="security"
     1.7 +TAGS="ssh"
     1.8  SHORT_DESC="Light SSH client and server using PAM."
     1.9  MAINTAINER="pascal.bellard@slitaz.org"
    1.10  LICENSE="MIT"
    1.11  WEB_SITE="https://github.com/mkj/dropbear"
    1.12 -TAGS="ssh"
    1.13 +
    1.14 +PROVIDE="dropbear:pam ssh:pam"
    1.15  WANTED="dropbear"
    1.16 -
    1.17  DEPENDS="dropbear pam"
    1.18 -PROVIDE="dropbear:pam ssh:pam"
    1.19  
    1.20  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.21  genpkg_rules()
    1.22  {
    1.23  	mkdir -p $fs/usr/sbin
    1.24 -	cp -a $install/usr/sbin/dropbear-pam $fs/usr/sbin/dropbear
    1.25 +	cp -a $install/usr/sbin/dropbear-pam	$fs/usr/sbin/dropbear
    1.26  }
    1.27  
    1.28  post_remove()
     2.1 --- a/dropbear/description.txt	Wed Nov 13 15:24:31 2024 +0100
     2.2 +++ b/dropbear/description.txt	Fri Dec 13 16:03:39 2024 +0100
     2.3 @@ -5,4 +5,4 @@
     2.4  It implements most required features of the SSH 2 protocol, and other
     2.5  features such as X11 and authentication agent forwarding.
     2.6  
     2.7 -See http://matt.ucc.asn.au/dropbear/dropbear.html
     2.8 +See https://matt.ucc.asn.au/dropbear/dropbear.html
     3.1 --- a/dropbear/receipt	Wed Nov 13 15:24:31 2024 +0100
     3.2 +++ b/dropbear/receipt	Fri Dec 13 16:03:39 2024 +0100
     3.3 @@ -3,21 +3,25 @@
     3.4  PACKAGE="dropbear"
     3.5  VERSION="2024.86"
     3.6  CATEGORY="security"
     3.7 +TAGS="ssh"
     3.8  SHORT_DESC="Lightweight SSH2 server and client"
     3.9  MAINTAINER="pascal.bellard@slitaz.org"
    3.10  LICENSE="MIT"
    3.11 +WEB_SITE="https://github.com/mkj/dropbear"
    3.12 +
    3.13  TARBALL="$PACKAGE-$VERSION.tar.bz2"
    3.14 -WEB_SITE="https://github.com/mkj/dropbear"
    3.15  WGET_URL="https://matt.ucc.asn.au/dropbear/releases/$TARBALL"
    3.16 +
    3.17  CONFIG_FILES="/etc/dropbear/banner"
    3.18  SECRET_FILES="/etc/dropbear/*key"
    3.19 +
    3.20  SUGGESTED="sftp-server"
    3.21  PROVIDE="ssh"
    3.22 -TAGS="ssh"
    3.23 -HOST_ARCH="i486 arm"
    3.24  
    3.25  DEPENDS="zlib"
    3.26 -BUILD_DEPENDS="zlib-dev pam pam-dev"
    3.27 +BUILD_DEPENDS="pam pam-dev zlib-dev"
    3.28 +
    3.29 +HOST_ARCH="i486 arm"
    3.30  
    3.31  # Handle multiarch compilation.
    3.32  case "$ARCH" in
    3.33 @@ -45,10 +49,15 @@
    3.34  #define DROPBEAR_X11FWD 1
    3.35  EOT
    3.36  	sed -i 's|shell arch|shell uname -m|' libtommath/makefile_include.mk
    3.37 -	./configure --prefix=/usr --without-pam $CONFIGURE_ARGS $CROSS_ARGS &&
    3.38 -	make PROGRAMS="dropbear $DROPBEARS" MULTI=1 SCPPROGRESS=1 &&
    3.39 -	install -d -m 755 $DESTDIR/usr/sbin &&
    3.40 -	install -m 755 dropbearmulti $DESTDIR/usr/sbin/dropbear &&
    3.41 +	./configure			\
    3.42 +		--prefix=/usr		\
    3.43 +		--disable-lastlog	\
    3.44 +		--without-pam		\
    3.45 +		$CONFIGURE_ARGS		\
    3.46 +		$CROSS_ARGS &&
    3.47 +	make	PROGRAMS="dropbear $DROPBEARS" MULTI=1 SCPPROGRESS=1 &&
    3.48 +	install -d -m 755		$DESTDIR/usr/sbin &&
    3.49 +	install -m 755 dropbearmulti	$DESTDIR/usr/sbin/dropbear &&
    3.50  	chown 0.0 $DESTDIR/usr/sbin/dropbear || exit 1
    3.51  
    3.52  	# No pam support in ARM
    3.53 @@ -59,64 +68,71 @@
    3.54  #define DROPBEAR_SVR_PASSWORD_AUTH 0
    3.55  #define DROPBEAR_SVR_PAM_AUTH 1
    3.56  EOT
    3.57 -			./configure --prefix=/usr --enable-pam $CONFIGURE_ARGS &&
    3.58 -			make PROGRAMS="dropbear $DROPBEARS" MULTI=1 SCPPROGRESS=1 &&
    3.59 -			install -m 755 dropbearmulti $DESTDIR/usr/sbin/dropbear-pam &&
    3.60 -			chown 0.0 $DESTDIR/usr/sbin/dropbear-pam || exit 1 ;;
    3.61 +			./configure			\
    3.62 +				--prefix=/usr		\
    3.63 +				--disable-lastlog	\
    3.64 +				--enable-pam		\
    3.65 +				$CONFIGURE_ARGS &&
    3.66 +			make	PROGRAMS="dropbear $DROPBEARS" MULTI=1 SCPPROGRESS=1 &&
    3.67 +			install -m 755 dropbearmulti	$DESTDIR/usr/sbin/dropbear-pam &&
    3.68 +			chown 0.0			$DESTDIR/usr/sbin/dropbear-pam || exit 1 ;;
    3.69  	esac
    3.70  
    3.71  	install -d -m 755 $DESTDIR/usr/bin &&
    3.72  	for i in $DROPBEARS ssh; do
    3.73  		ln -s ../sbin/dropbear $DESTDIR/usr/bin/$i || exit 1
    3.74  	done
    3.75 -	install -d -m 755 $DESTDIR/usr/share/man/man1 &&
    3.76 -	install -m 644 $src/manpages/*.1 $DESTDIR/usr/share/man/man1 && 
    3.77 -	install -d -m 755 $DESTDIR/usr/share/man/man8 &&
    3.78 -	install -m 644 $src/manpages/*.8 $DESTDIR/usr/share/man/man8 &&
    3.79 -	install -d -m 755 $DESTDIR/usr/share/doc &&
    3.80 -	install -m 644 $src/[A-Z][A-Z]* $DESTDIR/usr/share/doc
    3.81 +	install -d -m 755			$DESTDIR/usr/share/man/man1 &&
    3.82 +	install -m 644 $src/manpages/*.1	$DESTDIR/usr/share/man/man1 && 
    3.83 +	install -d -m 755			$DESTDIR/usr/share/man/man8 &&
    3.84 +	install -m 644 $src/manpages/*.8	$DESTDIR/usr/share/man/man8 &&
    3.85 +	install -d -m 755			$DESTDIR/usr/share/doc &&
    3.86 +	install -m 644 $src/[A-Z][A-Z]*		$DESTDIR/usr/share/doc
    3.87  }
    3.88  
    3.89  # Rules to gen a SliTaz package suitable for Tazpkg.
    3.90  genpkg_rules()
    3.91  {
    3.92  	mkdir -p $fs/usr
    3.93 -	cp -a $install/usr/bin $fs/usr
    3.94 -	cp -a $install/usr/sbin $fs/usr
    3.95 -	rm -f $fs/usr/sbin/dropbear-pam
    3.96 -	# Config file and init script.
    3.97 +	cp -a $install/usr/bin	$fs/usr
    3.98 +	cp -a $install/usr/sbin	$fs/usr
    3.99 +	rm -f			$fs/usr/sbin/dropbear-pam
   3.100 +	# Configuration file and init script.
   3.101  	mkdir -p $fs/etc
   3.102 -	cp -a $stuff/dropbear $fs/etc
   3.103 -	cp -a $stuff/init.d $fs/etc
   3.104 -	ln -s daemon $fs/etc/init.d/sshd
   3.105 -	cp -a $stuff/sshx $fs/usr/bin
   3.106 -	ln -s sshx $fs/usr/bin/pppssh
   3.107 -	ln -s sshx $fs/usr/bin/sshfbvnc
   3.108 +	cp -a $stuff/dropbear	$fs/etc
   3.109 +	cp -a $stuff/init.d	$fs/etc
   3.110 +	ln -s daemon		$fs/etc/init.d/sshd
   3.111 +	cp -a $stuff/sshx	$fs/usr/bin
   3.112 +	ln -s sshx		$fs/usr/bin/pppssh
   3.113 +	ln -s sshx		$fs/usr/bin/sshfbvnc
   3.114  	touch	$fs/etc/dropbear/dropbear_rsa_host_key \
   3.115  		$fs/etc/dropbear/dropbear_ecdsa_host_key \
   3.116  		$fs/etc/dropbear/dropbear_ed25519_host_key
   3.117  
   3.118 -	# Fix dropbear initscript perms
   3.119 -	chown -R root.root $fs
   3.120 +	# Fix dropbear initscript permissions
   3.121 +	chown -R root.root	$fs
   3.122  }
   3.123  
   3.124  # Pre and post install commands for Tazpkg.
   3.125  pre_install()
   3.126  {
   3.127 -	for key in dropbear_rsa_host_key dropbear_ecdsa_host_key dropbear_ed25519_host_key ; do
   3.128 -		[ -s "$1/etc/dropbear/$key" ] && mv "$1/etc/dropbear/$key" "$1/etc/dropbear/$key.saved"
   3.129 -	done
   3.130 +	for key in dropbear_rsa_host_key dropbear_ecdsa_host_key dropbear_ed25519_host_key
   3.131 +	  do
   3.132 +		[ -s "$1/etc/dropbear/$key" ] &&
   3.133 +		mv   "$1/etc/dropbear/$key"	"$1/etc/dropbear/$key.saved"
   3.134 +	  done
   3.135  }
   3.136  
   3.137  post_install()
   3.138  {
   3.139 -	while read dropbear openssh ; do
   3.140 +	while read dropbear openssh
   3.141 +	  do
   3.142  		[ -s "$1/$dropbear.saved" ] && mv "$1/$dropbear.saved" "$1/$dropbear"  
   3.143  		[ -s "$1/$openssh" ] || continue
   3.144  		[ -s "$1/$dropbear" ] && continue
   3.145  		chroot "$1/" dropbearconvert openssh dropbear $openssh $dropbear
   3.146  		chroot "$1/" dropbearkey -y -f $dropbear | grep Fingerprint
   3.147 -	done <<EOT
   3.148 +	  done <<EOT
   3.149  /etc/dropbear/dropbear_rsa_host_key	/etc/ssh/ssh_host_rsa_key
   3.150  /etc/dropbear/dropbear_ecdsa_host_key	/etc/ssh/ssh_host_ecdsa_key
   3.151  /etc/dropbear/dropbear_ed25519_host_key	/etc/ssh/ssh_host_ed25519_key
   3.152 @@ -125,12 +141,13 @@
   3.153  #ssh	stream	tcp	nowait	root	dropbear	dropbear	-i -b /etc/dropbear/banner
   3.154  EOT
   3.155  	[ -n "$quiet" ] && return
   3.156 -	echo -e "\nTo starts $PACKAGE server you can run :\n"
   3.157 +	echo -e "\nTo start $PACKAGE server you can run:"
   3.158  	echo "/etc/init.d/$PACKAGE start"
   3.159  	echo -e "Or add $PACKAGE to RUN_DAEMONS in /etc/rcS.conf\n"
   3.160  }
   3.161  
   3.162  post_remove()
   3.163  {
   3.164 -	grep -q dropbear "$1/etc/inetd.conf" && sed -i '/dropbear/d' "$1/etc/inetd.conf"
   3.165 +	grep -q dropbear "$1/etc/inetd.conf" &&
   3.166 +	sed -i '/dropbear/d' "$1/etc/inetd.conf"
   3.167  }