wok rev 20233

Up Dropbear (2018.76)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Mon Mar 05 12:39:40 2018 +0100 (2018-03-05)
parents 2daa5a09db14
children 1f1f942f3404
files dropbear-pam/receipt dropbear/receipt
line diff
     1.1 --- a/dropbear-pam/receipt	Mon Mar 05 11:05:36 2018 +0100
     1.2 +++ b/dropbear-pam/receipt	Mon Mar 05 12:39:40 2018 +0100
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="dropbear-pam"
     1.7 -VERSION="2017.75"
     1.8 +VERSION="2018.76"
     1.9  CATEGORY="security"
    1.10  SHORT_DESC="Light SSH client and server using PAM."
    1.11  MAINTAINER="pascal.bellard@slitaz.org"
     2.1 --- a/dropbear/receipt	Mon Mar 05 11:05:36 2018 +0100
     2.2 +++ b/dropbear/receipt	Mon Mar 05 12:39:40 2018 +0100
     2.3 @@ -1,7 +1,7 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="dropbear"
     2.7 -VERSION="2017.75"
     2.8 +VERSION="2018.76"
     2.9  CATEGORY="security"
    2.10  SHORT_DESC="Lightweight SSH2 server and client"
    2.11  MAINTAINER="pascal.bellard@slitaz.org"
    2.12 @@ -32,10 +32,9 @@
    2.13  	local i
    2.14  	local DROPBEARS
    2.15  	DROPBEARS="dropbearkey dropbearconvert dbclient scp"
    2.16 -	sed -i  -e 's|/usr/.*/xauth|/usr/bin/xauth|' \
    2.17 -		-e 's|/usr/.*/sftp-server|/usr/sbin/sftp-server|' \
    2.18 -		-e 's|ENABLE_SVR_PAM_AUTH|ENABLE_SVR_PASSWORD_AUTH|' \
    2.19 -		options.h
    2.20 +	cat > localoptions.h <<EOT
    2.21 +#define SFTPSERVER_PATH "/usr/sbin/sftp-server"
    2.22 +EOT
    2.23  	./configure --prefix=/usr --without-pam $CONFIGURE_ARGS $CROSS_ARGS &&
    2.24  	make PROGRAMS="dropbear $DROPBEARS" MULTI=1 SCPPROGRESS=1 &&
    2.25  	install -d -m 755 $DESTDIR/usr/sbin &&
    2.26 @@ -46,8 +45,10 @@
    2.27  	case "$ARCH" in
    2.28  		arm) echo "Skipping Dropbear PAM..." ;;
    2.29  		i?86)
    2.30 -			sed -i 's|ENABLE_SVR_PASSWORD_AUTH|ENABLE_SVR_PAM_AUTH|' \
    2.31 -				options.h
    2.32 +			cat >> localoptions.h <<EOT
    2.33 +#define DROPBEAR_SVR_PASSWORD_AUTH 0
    2.34 +#define DROPBEAR_SVR_PAM_AUTH 1
    2.35 +EOT
    2.36  			./configure --prefix=/usr --enable-pam $CONFIGURE_ARGS &&
    2.37  			make PROGRAMS="dropbear $DROPBEARS" MULTI=1 SCPPROGRESS=1 &&
    2.38  			install -m 755 dropbearmulti $DESTDIR/usr/sbin/dropbear-pam &&