SliTaz Repositories

     1.1 --- a/dropbear/receipt	Fri Jul 20 16:59:33 2018 +0300
     1.2 +++ b/dropbear/receipt	Fri Nov 02 14:15:08 2018 +0200
     1.3 @@ -11,20 +11,10 @@
     1.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
     1.5  WGET_URL="http://matt.ucc.asn.au/dropbear/releases/$TARBALL"
     1.6  
     1.7 -case "$ARCH" in
     1.8 -	i486)   BUILD_DEPENDS="zlib-dev pam pam-dev"; SPLIT="dropbear-pam";;
     1.9 -	x86_64) BUILD_DEPENDS="zlib-dev";;
    1.10 -	arm*)   BUILD_DEPENDS="";;
    1.11 -esac
    1.12 +BUILD_DEPENDS="zlib-dev pam-dev"
    1.13 +SPLIT="$PACKAGE-pam"
    1.14  
    1.15  compile_rules() {
    1.16 -	# Handle multiarch compilation.
    1.17 -	case "$ARCH" in
    1.18 -		arm)
    1.19 -			CROSS_ARGS="--disable-zlib"
    1.20 -			CROSS_BUGS="Fails to find zlib: -lz... no" ;;
    1.21 -	esac
    1.22 -
    1.23  	local i DROPBEARS="dropbearkey dropbearconvert dbclient scp"
    1.24  	sed -iold -e 's|/usr/.*/xauth|/usr/bin/xauth|' \
    1.25  		-e 's|ENABLE_SVR_PAM_AUTH|ENABLE_SVR_PASSWORD_AUTH|' \
    1.26 @@ -33,27 +23,20 @@
    1.27  	./configure \
    1.28  		--prefix=/usr \
    1.29  		--without-pam \
    1.30 -		$CONFIGURE_ARGS $CROSS_ARGS &&
    1.31 +		$CONFIGURE_ARGS &&
    1.32  	make PROGRAMS="dropbear $DROPBEARS" MULTI=1 SCPPROGRESS=1 &&
    1.33 -	install -dm755 $install/usr/sbin &&
    1.34 -	install -m755 dropbearmulti $install/usr/sbin/dropbear || exit 1
    1.35 +	install -Dm755 dropbearmulti $install/usr/sbin/dropbear || return 1
    1.36  
    1.37 -	# No PAM support in ARM
    1.38 -	case "$ARCH" in
    1.39 -		arm) echo "Skipping Dropbear PAM..." ;;
    1.40 -		i?86)
    1.41 -			sed -i 's|ENABLE_SVR_PASSWORD_AUTH|ENABLE_SVR_PAM_AUTH|' options.h
    1.42 -			./configure \
    1.43 -				--enable-pam \
    1.44 -				$CONFIGURE_ARGS &&
    1.45 -			make PROGRAMS="dropbear $DROPBEARS" MULTI=1 SCPPROGRESS=1 &&
    1.46 -			install -m755 dropbearmulti $install/usr/sbin/dropbear-pam || return 1
    1.47 -			;;
    1.48 -	esac
    1.49 +	sed -i 's|ENABLE_SVR_PASSWORD_AUTH|ENABLE_SVR_PAM_AUTH|' options.h
    1.50 +	./configure \
    1.51 +		--enable-pam \
    1.52 +		$CONFIGURE_ARGS &&
    1.53 +	make PROGRAMS="dropbear $DROPBEARS" MULTI=1 SCPPROGRESS=1 &&
    1.54 +	install -Dm755 dropbearmulti $install/usr/sbin/dropbear-pam || return 1
    1.55  
    1.56  	install -dm755 $install/usr/bin &&
    1.57  	for i in $DROPBEARS ssh; do
    1.58 -		ln -s ../sbin/dropbear $install/usr/bin/$i || exit 1
    1.59 +		ln -s ../sbin/dropbear $install/usr/bin/$i || return 1
    1.60  	done
    1.61  
    1.62  	cook_pick_manpages $src/*.1 $src/*.8
    1.63 @@ -77,7 +60,6 @@
    1.64  	chown -R root:root $install
    1.65  
    1.66  	ln -s daemon $install/etc/init.d/sshd
    1.67 -
    1.68  }
    1.69  
    1.70  genpkg_rules() {
    1.71 @@ -116,14 +98,13 @@
    1.72  	grep -q ssh "$1/etc/inetd.conf" || cat >> "$1/etc/inetd.conf" <<EOT
    1.73  #ssh	stream	tcp	nowait	root	dropbear	dropbear	-i -b /etc/dropbear/banner
    1.74  EOT
    1.75 -	[ -n "$quiet" ] && return
    1.76 -	cat <<EOT
    1.77 +	[ -n "$quiet" ] || cat <<EOT
    1.78  
    1.79  	.-------------------------------------------------.
    1.80  	| To start dropbear server you can run:           |
    1.81 +	|    /etc/init.d/dropbear start                   |
    1.82  	|                                                 |
    1.83 -	| /etc/init.d/dropbear start                      |
    1.84 -	| Or add dropbear to RUN_DAEMONS in /etc/rcS.conf |
    1.85 +	| or add dropbear to RUN_DAEMONS in /etc/rcS.conf |
    1.86  	'-------------------------------------------------'
    1.87  EOT
    1.88  }