wok-6.x rev 20876

openssh: add ssh-copy-id
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sat Feb 23 23:00:18 2019 +0100 (2019-02-23)
parents 65d1668b0834
children 809015307697
files linld/stuff/src/TAZBOOT.CPP openssh-pam/receipt openssh/receipt
line diff
     1.1 --- a/linld/stuff/src/TAZBOOT.CPP	Sat Feb 23 15:57:08 2019 +0100
     1.2 +++ b/linld/stuff/src/TAZBOOT.CPP	Sat Feb 23 23:00:18 2019 +0100
     1.3 @@ -131,8 +131,7 @@
     1.4  		if (*init && isolseek(&initrddesc) != 0) {
     1.5  			read(x->fd, &x->filemod, 10); // + x->fileofs & x->filesize
     1.6  			magic = x->filemod;
     1.7 -			x->fileofs &= 0xFFFFL;
     1.8 -			x->fileofs -= 0xC0L + (x->filesize &= 0xFFFF);
     1.9 +			x->fileofs = 0x7FF0 - (x->filesize &= 0xFFFF);
    1.10  			if (((short *) &x->fileofs)[1] == 0) addinitrd();
    1.11  			else init="";
    1.12  		}
     2.1 --- a/openssh-pam/receipt	Sat Feb 23 15:57:08 2019 +0100
     2.2 +++ b/openssh-pam/receipt	Sat Feb 23 23:00:18 2019 +0100
     2.3 @@ -15,7 +15,8 @@
     2.4  
     2.5  PROVIDE="openssh:pam ssh:pam"
     2.6  DEPENDS="sftp-server libcrypto zlib pam"
     2.7 -BUILD_DEPENDS="libcrypto-dev zlib-dev openssl-dev pam pam-dev"
     2.8 +BUILD_DEPENDS="libcrypto-dev zlib-dev openssl-dev pam pam-dev gtk+-dev"
     2.9 +SUGGESTED="gtk+"
    2.10  TAZPANEL_DAEMON="man::sshd|edit::/etc/ssh/sshd_config|options::OPENSSH_OPTIONS|web::$WEB_SITE"
    2.11  
    2.12  # Rules to configure and make the package.
    2.13 @@ -37,6 +38,10 @@
    2.14  	make DESTDIR=$DESTDIR install
    2.15  	install -d -m 755 $DESTDIR/usr/share/doc &&
    2.16  	install -m 644 $src/[A-Z][A-Z]* $DESTDIR/usr/share/doc
    2.17 +	cd contrib &&
    2.18 +	cc -Wall $(pkg-config --cflags gtk+-2.0) gnome-ssh-askpass2.c \
    2.19 +		-o gnome-ssh-askpass $(pkg-config --libs gtk+-2.0) &&
    2.20 +	cp gnome-ssh-askpass $DESTDIR/usr/bin/ssh-askpass
    2.21  }
    2.22  
    2.23  # Rules to gen a SliTaz package suitable for Tazpkg.
    2.24 @@ -45,6 +50,9 @@
    2.25  	mkdir -p $fs/usr $fs/etc/init.d $fs/etc/ssh
    2.26  	cp -a $install/usr/sbin $install/usr/bin $fs/usr
    2.27  	rm -f $fs/usr/sbin/sftp-server
    2.28 +	install -D -m 755 -oroot -groot $src/contrib/sshd.pam.generic $fs/etc/pam.d/sshd
    2.29 +	install -m 755 -oroot -groot $src/contrib/ssh-copy-id $fs/usr/bin
    2.30 +	cp $src/contrib/ssh-copy-id.1 $install/usr/share/man/cat1
    2.31  	cp -a $install/etc $fs
    2.32  	cp ../$SOURCE/stuff/openssh $fs/etc/init.d
    2.33  	sed -i 's/.*UsePAM.*/UsePAM yes/' $fs/etc/ssh/sshd_config
     3.1 --- a/openssh/receipt	Sat Feb 23 15:57:08 2019 +0100
     3.2 +++ b/openssh/receipt	Sat Feb 23 23:00:18 2019 +0100
     3.3 @@ -15,7 +15,8 @@
     3.4  
     3.5  PROVIDE="ssh"
     3.6  DEPENDS="sftp-server libcrypto zlib"
     3.7 -BUILD_DEPENDS="libcrypto-dev zlib-dev openssl-dev"
     3.8 +BUILD_DEPENDS="libcrypto-dev zlib-dev openssl-dev gtk+-dev"
     3.9 +SUGGESTED="gtk+"
    3.10  TAZPANEL_DAEMON="man::sshd|edit::/etc/ssh/sshd_config|options|web::$WEB_SITE"
    3.11  
    3.12  # Rules to configure and make the package.
    3.13 @@ -37,6 +38,10 @@
    3.14  	make DESTDIR=$DESTDIR install
    3.15  	install -d -m 755 $DESTDIR/usr/share/doc &&
    3.16  	install -m 644 $src/[A-Z][A-Z]* $DESTDIR/usr/share/doc
    3.17 +	cd contrib &&
    3.18 +	cc -Wall $(pkg-config --cflags gtk+-2.0) gnome-ssh-askpass2.c \
    3.19 +		-o gnome-ssh-askpass $(pkg-config --libs gtk+-2.0) &&
    3.20 +	cp gnome-ssh-askpass $DESTDIR/usr/bin/ssh-askpass
    3.21  }
    3.22  
    3.23  # Rules to gen a SliTaz package suitable for Tazpkg.
    3.24 @@ -45,6 +50,8 @@
    3.25  	mkdir -p $fs/usr $fs/etc/init.d $fs/etc/ssh
    3.26  	cp -a $install/usr/sbin $install/usr/bin $fs/usr
    3.27  	rm -f $fs/usr/sbin/sftp-server
    3.28 +	install -m 755 -oroot -groot $src/contrib/ssh-copy-id $fs/usr/bin
    3.29 +	cp $src/contrib/ssh-copy-id.1 $install/usr/share/man/cat1
    3.30  	cp -a $install/etc $fs
    3.31  	cp $stuff/openssh $fs/etc/init.d
    3.32  	sed -i 's|/usr/libexec/sftp-server|/usr/sbin/sftp-server|' \