wok diff dropbear/receipt @ rev 13843

get-LibreOffice: bb/ls checks target link now.
author Pascal Bellard <pascal.bellard@slitaz.org>
date Tue Jan 08 12:44:48 2013 +0100 (2013-01-08)
parents b2cca7c91b35
children caf768bb46f9
line diff
     1.1 --- a/dropbear/receipt	Tue May 22 17:21:11 2012 +0200
     1.2 +++ b/dropbear/receipt	Tue Jan 08 12:44:48 2013 +0100
     1.3 @@ -6,20 +6,23 @@
     1.4  SHORT_DESC="Light SSH client and server."
     1.5  MAINTAINER="pascal.bellard@slitaz.org"
     1.6  TARBALL="$PACKAGE-$VERSION.tar.bz2"
     1.7 -SUGGESTED="sftp-server"
     1.8  WEB_SITE="http://matt.ucc.asn.au/dropbear/dropbear.html"
     1.9  WGET_URL="http://matt.ucc.asn.au/dropbear/releases/$TARBALL"
    1.10  CONFIG_FILES="/etc/dropbear"
    1.11 +SUGGESTED="sftp-server"
    1.12  PROVIDE="ssh"
    1.13  TAGS="ssh"
    1.14 -#HOST_ARCH="i486 arm"
    1.15 +HOST_ARCH="i486 arm"
    1.16  
    1.17  DEPENDS="zlib"
    1.18  BUILD_DEPENDS="zlib-dev pam pam-dev"
    1.19  
    1.20 -# Handle multiarch compilation
    1.21 +# Handle multiarch compilation.
    1.22  case "$ARCH" in
    1.23 -	arm) BUILD_DEPENDS="zlib-dev" ;;
    1.24 +	arm)
    1.25 +		BUILD_DEPENDS=""
    1.26 +		CROSS_ARGS="--disable-zlib"
    1.27 +		CROSS_BUGS="Fails to find zlib: -lz... no" ;;
    1.28  esac
    1.29  
    1.30  # Rules to configure and make the package.
    1.31 @@ -33,7 +36,7 @@
    1.32  		-e 's|/usr/.*/sftp-server|/usr/sbin/sftp-server|' \
    1.33   		-e 's|ENABLE_SVR_PAM_AUTH|ENABLE_SVR_PASSWORD_AUTH|' \
    1.34  		options.h
    1.35 -	./configure --prefix=/usr --without-pam $CONFIGURE_ARGS &&
    1.36 +	./configure --prefix=/usr --without-pam $CONFIGURE_ARGS $CROSS_ARGS &&
    1.37  	make PROGRAMS="dropbear $DROPBEARS" MULTI=1 SCPPROGRESS=1 &&
    1.38  	install -d -m 755 $DESTDIR/usr/sbin &&
    1.39  	install -m 755 dropbearmulti $DESTDIR/usr/sbin/dropbear &&
    1.40 @@ -42,7 +45,7 @@
    1.41  	# No pam support in ARM
    1.42  	case "$ARCH" in
    1.43  		arm) echo "Skipping Dropbear PAM..." ;;
    1.44 -		*)
    1.45 +		i?86)
    1.46  			sed -i 's|ENABLE_SVR_PASSWORD_AUTH|ENABLE_SVR_PAM_AUTH|' \
    1.47  				options.h
    1.48  			./configure --prefix=/usr --enable-pam $CONFIGURE_ARGS &&