From 5eb67571aa638c1bb35bf518a50d96ae4e80a88a Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 22 Jun 2004 14:33:09 +0000 Subject: Disable shadow password support in openssh-server-udeb. --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index dd8b894a4..9a63fdce0 100755 --- a/debian/rules +++ b/debian/rules @@ -75,7 +75,7 @@ build-udeb: build-udeb-stamp build-udeb-stamp: dh_testdir mkdir -p build-udeb - cd build-udeb && $(FORCE_LIBS) ../configure --prefix=/usr --sysconfdir=/etc/ssh --without-xauth --with-default-path=/usr/local/bin:/bin:/usr/bin --with-superuser-path=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin --with-4in6 --with-privsep-path=/var/run/sshd --without-rand-helper + cd build-udeb && $(FORCE_LIBS) ../configure --prefix=/usr --sysconfdir=/etc/ssh --without-xauth --with-default-path=/usr/local/bin:/bin:/usr/bin --with-superuser-path=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin --with-4in6 --with-privsep-path=/var/run/sshd --without-rand-helper --without-shadow # Avoid libnsl linkage. Ugh. perl -pi -e 's/ +-lnsl//' build-udeb/config.status cd build-udeb && ./config.status -- cgit v1.2.3 From 47baf070161032fc38041646ecccb8b929ed860a Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Sat, 10 Jul 2004 12:39:00 +0000 Subject: Add scp and sftp to openssh-client-udeb. It might not be very 'u' any more; oh well. --- debian/changelog | 2 ++ debian/rules | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index 71a58cf2a..453116eff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ openssh (1:3.8.1p1-5) UNRELEASED; urgency=low * Apply patch from Darren Tucker to make the PAM authentication SIGCHLD handler kill the PAM thread if its waitpid() call returns 0, as well as the previous check for -1 (closes: #252676). + * Add scp and sftp to openssh-client-udeb. It might not be very 'u' any + more; oh well. -- Colin Watson Wed, 2 Jun 2004 14:26:18 -0300 diff --git a/debian/rules b/debian/rules index 9a63fdce0..c62447db2 100755 --- a/debian/rules +++ b/debian/rules @@ -79,7 +79,7 @@ build-udeb-stamp: # Avoid libnsl linkage. Ugh. perl -pi -e 's/ +-lnsl//' build-udeb/config.status cd build-udeb && ./config.status - $(MAKE) -C build-udeb -j 2 ASKPASS_PROGRAM='/usr/bin/ssh-askpass' CFLAGS='-Os -g -Wall -DSSH_VERSION="\"$(SSH_VERSION)\""' SSH_KEYSIGN='/usr/lib/ssh-keysign' ssh sshd ssh-keygen + $(MAKE) -C build-udeb -j 2 ASKPASS_PROGRAM='/usr/bin/ssh-askpass' CFLAGS='-Os -g -Wall -DSSH_VERSION="\"$(SSH_VERSION)\""' SSH_KEYSIGN='/usr/lib/ssh-keysign' ssh scp sftp sshd ssh-keygen touch build-udeb-stamp clean: @@ -143,6 +143,8 @@ install: build install -o root -g root -m 755 -d debian/ssh/var/run/sshd install -m 755 build-udeb/ssh debian/openssh-client-udeb/usr/bin/ssh + install -m 755 build-udeb/scp debian/openssh-client-udeb/usr/bin/scp + install -m 755 build-udeb/sftp debian/openssh-client-udeb/usr/bin/sftp install -m 755 build-udeb/sshd debian/openssh-server-udeb/usr/sbin/sshd install -m 755 build-udeb/ssh-keygen debian/openssh-server-udeb/usr/bin/ssh-keygen -- cgit v1.2.3 From 2617d6163d22618e7cfda1a11ebba4c57ad40d24 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 19 Jul 2004 19:25:25 +0000 Subject: Implement hack in http://lists.debian.org/debian-boot/2004/07/msg01207.html to get openssh-client-udeb to show up as a retrievable debian-installer component. --- debian/changelog | 9 +++++++++ debian/control | 1 + debian/openssh-client-udeb.isinstallable | 10 ++++++++++ debian/rules | 1 + 4 files changed, 21 insertions(+) create mode 100644 debian/openssh-client-udeb.isinstallable (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index c77dd2819..a588623bd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +openssh (1:3.8.1p1-6) UNRELEASED; urgency=low + + * Implement hack in + http://lists.debian.org/debian-boot/2004/07/msg01207.html to get + openssh-client-udeb to show up as a retrievable debian-installer + component. + + -- Colin Watson Mon, 19 Jul 2004 20:22:39 +0100 + openssh (1:3.8.1p1-5) unstable; urgency=medium * Update German debconf template translation (thanks, Helge Kreutzmann; diff --git a/debian/control b/debian/control index a234348c5..37899eb3c 100644 --- a/debian/control +++ b/debian/control @@ -51,6 +51,7 @@ Section: debian-installer Priority: optional Architecture: any Depends: ${shlibs:Depends}, libnss-files-udeb +XB-Installer-Menu-Item: 999 Description: Secure shell client for the Debian installer This is the portable version of OpenSSH, a free implementation of the Secure Shell protocol as specified by the IETF secsh working diff --git a/debian/openssh-client-udeb.isinstallable b/debian/openssh-client-udeb.isinstallable new file mode 100644 index 000000000..7591b6245 --- /dev/null +++ b/debian/openssh-client-udeb.isinstallable @@ -0,0 +1,10 @@ +#! /bin/sh + +# This is a hack to arrange for openssh-client-udeb to show up as a +# retrievable debian-installer component in expert mode (due to the +# Installer-Menu-Item: control field) while not actually appearing on the +# d-i main menu. See: +# +# http://lists.debian.org/debian-boot/2004/07/msg01207.html + +exit 1 diff --git a/debian/rules b/debian/rules index c62447db2..6fdfcc494 100755 --- a/debian/rules +++ b/debian/rules @@ -215,6 +215,7 @@ binary-openssh-client-udeb: build install dh_compress dh_fixperms dh_installdeb + cp -a debian/openssh-client-udeb.isinstallable debian/openssh-client-udeb/DEBIAN/isinstallable dh_shlibdeps dh_gencontrol -- -fdebian/files~ dpkg-distaddfile $(CLIENT_UDEB) debian-installer optional -- cgit v1.2.3