# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1550959218 -3600
# Node ID 07197587ca559062c4c0635a5809ff96a71d4091
# Parent  65d1668b0834f5b9277440aee2878de5bcae0625
openssh: add ssh-copy-id

diff -r 65d1668b0834 -r 07197587ca55 linld/stuff/src/TAZBOOT.CPP
--- a/linld/stuff/src/TAZBOOT.CPP	Sat Feb 23 15:57:08 2019 +0100
+++ b/linld/stuff/src/TAZBOOT.CPP	Sat Feb 23 23:00:18 2019 +0100
@@ -131,8 +131,7 @@
 		if (*init && isolseek(&initrddesc) != 0) {
 			read(x->fd, &x->filemod, 10); // + x->fileofs & x->filesize
 			magic = x->filemod;
-			x->fileofs &= 0xFFFFL;
-			x->fileofs -= 0xC0L + (x->filesize &= 0xFFFF);
+			x->fileofs = 0x7FF0 - (x->filesize &= 0xFFFF);
 			if (((short *) &x->fileofs)[1] == 0) addinitrd();
 			else init="";
 		}
diff -r 65d1668b0834 -r 07197587ca55 openssh-pam/receipt
--- a/openssh-pam/receipt	Sat Feb 23 15:57:08 2019 +0100
+++ b/openssh-pam/receipt	Sat Feb 23 23:00:18 2019 +0100
@@ -15,7 +15,8 @@
 
 PROVIDE="openssh:pam ssh:pam"
 DEPENDS="sftp-server libcrypto zlib pam"
-BUILD_DEPENDS="libcrypto-dev zlib-dev openssl-dev pam pam-dev"
+BUILD_DEPENDS="libcrypto-dev zlib-dev openssl-dev pam pam-dev gtk+-dev"
+SUGGESTED="gtk+"
 TAZPANEL_DAEMON="man::sshd|edit::/etc/ssh/sshd_config|options::OPENSSH_OPTIONS|web::$WEB_SITE"
 
 # Rules to configure and make the package.
@@ -37,6 +38,10 @@
 	make DESTDIR=$DESTDIR install
 	install -d -m 755 $DESTDIR/usr/share/doc &&
 	install -m 644 $src/[A-Z][A-Z]* $DESTDIR/usr/share/doc
+	cd contrib &&
+	cc -Wall $(pkg-config --cflags gtk+-2.0) gnome-ssh-askpass2.c \
+		-o gnome-ssh-askpass $(pkg-config --libs gtk+-2.0) &&
+	cp gnome-ssh-askpass $DESTDIR/usr/bin/ssh-askpass
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
@@ -45,6 +50,9 @@
 	mkdir -p $fs/usr $fs/etc/init.d $fs/etc/ssh
 	cp -a $install/usr/sbin $install/usr/bin $fs/usr
 	rm -f $fs/usr/sbin/sftp-server
+	install -D -m 755 -oroot -groot $src/contrib/sshd.pam.generic $fs/etc/pam.d/sshd
+	install -m 755 -oroot -groot $src/contrib/ssh-copy-id $fs/usr/bin
+	cp $src/contrib/ssh-copy-id.1 $install/usr/share/man/cat1
 	cp -a $install/etc $fs
 	cp ../$SOURCE/stuff/openssh $fs/etc/init.d
 	sed -i 's/.*UsePAM.*/UsePAM yes/' $fs/etc/ssh/sshd_config
diff -r 65d1668b0834 -r 07197587ca55 openssh/receipt
--- a/openssh/receipt	Sat Feb 23 15:57:08 2019 +0100
+++ b/openssh/receipt	Sat Feb 23 23:00:18 2019 +0100
@@ -15,7 +15,8 @@
 
 PROVIDE="ssh"
 DEPENDS="sftp-server libcrypto zlib"
-BUILD_DEPENDS="libcrypto-dev zlib-dev openssl-dev"
+BUILD_DEPENDS="libcrypto-dev zlib-dev openssl-dev gtk+-dev"
+SUGGESTED="gtk+"
 TAZPANEL_DAEMON="man::sshd|edit::/etc/ssh/sshd_config|options|web::$WEB_SITE"
 
 # Rules to configure and make the package.
@@ -37,6 +38,10 @@
 	make DESTDIR=$DESTDIR install
 	install -d -m 755 $DESTDIR/usr/share/doc &&
 	install -m 644 $src/[A-Z][A-Z]* $DESTDIR/usr/share/doc
+	cd contrib &&
+	cc -Wall $(pkg-config --cflags gtk+-2.0) gnome-ssh-askpass2.c \
+		-o gnome-ssh-askpass $(pkg-config --libs gtk+-2.0) &&
+	cp gnome-ssh-askpass $DESTDIR/usr/bin/ssh-askpass
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
@@ -45,6 +50,8 @@
 	mkdir -p $fs/usr $fs/etc/init.d $fs/etc/ssh
 	cp -a $install/usr/sbin $install/usr/bin $fs/usr
 	rm -f $fs/usr/sbin/sftp-server
+	install -m 755 -oroot -groot $src/contrib/ssh-copy-id $fs/usr/bin
+	cp $src/contrib/ssh-copy-id.1 $install/usr/share/man/cat1
 	cp -a $install/etc $fs
 	cp $stuff/openssh $fs/etc/init.d
 	sed -i 's|/usr/libexec/sftp-server|/usr/sbin/sftp-server|' \