summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2004-05-20 10:17:24 +0000
committerColin Watson <cjwatson@debian.org>2004-05-20 10:17:24 +0000
commitf82d1888cef329e18c06dbe9458c7d1a08cc4ecb (patch)
tree2ab63c50cdb5f5c1ddee23a8bff04a466ecc54bc /debian
parentac1235e8b4eac450a49f51c268353170d1b576f5 (diff)
Don't link against libnsl in udeb builds.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog1
-rwxr-xr-xdebian/rules3
2 files changed, 4 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 8d5fee834..1027d0818 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ openssh (1:3.8.1p1-2) UNRELEASED; urgency=low
5 * openssh-client-udeb and openssh-server-udeb depend on libnss-files-udeb 5 * openssh-client-udeb and openssh-server-udeb depend on libnss-files-udeb
6 (not yet uploaded). 6 (not yet uploaded).
7 * Restore ssh-askpass-gnome binary, lost by mistake. 7 * Restore ssh-askpass-gnome binary, lost by mistake.
8 * Don't link against libnsl in udeb builds.
8 9
9 -- Colin Watson <cjwatson@debian.org> Thu, 13 May 2004 10:00:44 +0100 10 -- Colin Watson <cjwatson@debian.org> Thu, 13 May 2004 10:00:44 +0100
10 11
diff --git a/debian/rules b/debian/rules
index 168f3f13c..2c2ce4015 100755
--- a/debian/rules
+++ b/debian/rules
@@ -76,6 +76,9 @@ build-udeb-stamp:
76 dh_testdir 76 dh_testdir
77 mkdir -p build-udeb 77 mkdir -p build-udeb
78 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 78 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
79 # Avoid libnsl linkage. Ugh.
80 perl -pi -e 's/ +-lnsl//' build-udeb/config.status
81 cd build-udeb && ./config.status
79 $(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 82 $(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
80 touch build-udeb-stamp 83 touch build-udeb-stamp
81 84