summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
-rwxr-xr-xdebian/rules10
2 files changed, 11 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index b95d21709..dcb30fc30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -65,6 +65,8 @@ openssh (1:4.6p1-1) UNRELEASED; urgency=low
65 * Belatedly build-depend on zlib1g-dev (>= 1:1.2.3-1) (closes: #333447). 65 * Belatedly build-depend on zlib1g-dev (>= 1:1.2.3-1) (closes: #333447).
66 * Build position-independent executables (only for debs, not for udebs) to 66 * Build position-independent executables (only for debs, not for udebs) to
67 take advantage of address space layout randomisation. 67 take advantage of address space layout randomisation.
68 * If building on Ubuntu, add /sbin, /usr/sbin, and /usr/local/sbin to the
69 default path.
68 70
69 -- Colin Watson <cjwatson@ubuntu.com> Tue, 12 Jun 2007 14:31:01 +0100 71 -- Colin Watson <cjwatson@ubuntu.com> Tue, 12 Jun 2007 14:31:01 +0100
70 72
diff --git a/debian/rules b/debian/rules
index 76dc5d83c..6e335cf6e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -62,13 +62,21 @@ endif
62# Change the version string to include the Debian version 62# Change the version string to include the Debian version
63SSH_EXTRAVERSION := Debian-$(shell dpkg-parsechangelog | sed -n -e '/^Version:/s/Version: //p' | sed -e 's/[^-]*-//') 63SSH_EXTRAVERSION := Debian-$(shell dpkg-parsechangelog | sed -n -e '/^Version:/s/Version: //p' | sed -e 's/[^-]*-//')
64 64
65DISTRIBUTOR := $(shell lsb_release -is || echo Debian)
66ifeq ($(DISTRIBUTOR),Ubuntu)
67DEFAULT_PATH := /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11:/usr/games
68else
69DEFAULT_PATH := /usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games
70endif
71SUPERUSER_PATH := /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11
72
65build: build-deb build-udeb 73build: build-deb build-udeb
66 74
67build-deb: build-deb-stamp 75build-deb: build-deb-stamp
68build-deb-stamp: 76build-deb-stamp:
69 dh_testdir 77 dh_testdir
70 mkdir -p build-deb 78 mkdir -p build-deb
71 cd build-deb && $(FORCE_LIBS) LDFLAGS='$(PIE_LDFLAGS)' ../configure --prefix=/usr --sysconfdir=/etc/ssh --libexecdir=/usr/lib/openssh --mandir=/usr/share/man --with-tcp-wrappers --with-xauth=/usr/bin/X11/xauth --with-default-path=/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games --with-superuser-path=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11 --with-pam --with-4in6 --with-privsep-path=/var/run/sshd --without-rand-helper --with-libedit --with-kerberos5=/usr --with-ssl-engine $(SELINUX) 79 cd build-deb && $(FORCE_LIBS) LDFLAGS='$(PIE_LDFLAGS)' ../configure --prefix=/usr --sysconfdir=/etc/ssh --libexecdir=/usr/lib/openssh --mandir=/usr/share/man --with-tcp-wrappers --with-xauth=/usr/bin/X11/xauth --with-default-path=$(DEFAULT_PATH) --with-superuser-path=$(SUPERUSER_PATH) --with-pam --with-4in6 --with-privsep-path=/var/run/sshd --without-rand-helper --with-libedit --with-kerberos5=/usr --with-ssl-engine $(SELINUX)
72 80
73ifeq ($(DEB_HOST_ARCH_OS),linux) 81ifeq ($(DEB_HOST_ARCH_OS),linux)
74 # Some 2.2 kernels have trouble with setres[ug]id() (bug #239999). 82 # Some 2.2 kernels have trouble with setres[ug]id() (bug #239999).