Debian release 3.5p1-5.

7 files changed, 43 insertions, 6 deletions

diff --git a/debian/changelog b/debian/changelog
index b4d6b4258..e5f2004eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+openssh (1:3.5p1-5) unstable; urgency=low
+
+  * Add /etc/default/ssh (closes: #161049).
+  * Run the init script under 'set -e' (closes: #175010).
+  * Change the default superuser path to include /sbin, /usr/sbin, and
+    /usr/local/sbin (closes: #128235, #151267). Using login.defs would be
+    nice, but that belongs to another package. Without a defined API to
+    retrieve its settings, parsing it is off-limits.
+  * Build ssh-askpass-gnome with GNOME 2. The source package should still
+    support building on stable with GNOME 1, using the alternate
+    libgnome-dev build-dependency (thanks, Colin Walters; closes: #167582).
+
+ -- Colin Watson <cjwatson@debian.org>  Sun,  9 Mar 2003 20:12:10 +0000
+
 openssh (1:3.5p1-4) unstable; urgency=low
 
   * Point rlogin and rcp alternatives at slogin and scp respectively rather
diff --git a/debian/conffiles b/debian/conffiles
index fbc2e8444..b5c7a47fc 100644
--- a/debian/conffiles
+++ b/debian/conffiles
@@ -2,3 +2,4 @@
 /etc/ssh/moduli
 /etc/init.d/ssh
 /etc/pam.d/ssh
+/etc/default/ssh
diff --git a/debian/control b/debian/control
index 034286457..5a69855e2 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: openssh
 Section: net
 Priority: standard
 Maintainer: Matthew Vernon <matthew@debian.org>
-Build-Depends: libwrap0-dev | libwrap-dev, zlib1g-dev | libz-dev, libssl-dev, libpam0g-dev | libpam-dev, libgnome-dev, groff, debhelper (>=1.1.17), sharutils
+Build-Depends: libwrap0-dev | libwrap-dev, zlib1g-dev | libz-dev, libssl-dev, libpam0g-dev | libpam-dev, libgnomeui-dev (>= 2.0.0) | libgnome-dev, groff, debhelper (>=1.1.17), sharutils
 Standards-Version: 3.5.6
 Uploaders: Colin Watson <cjwatson@debian.org>
 
diff --git a/debian/dirs b/debian/dirs
index 00a019411..1496845fc 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -3,5 +3,6 @@ usr/sbin
 usr/lib
 etc/ssh
 etc/init.d
+etc/default
 usr/share/man/man1
 usr/share/man/man8
diff --git a/debian/init b/debian/init
index ea39a8bd0..0eddf722e 100644
--- a/debian/init
+++ b/debian/init
@@ -1,10 +1,15 @@
 #! /bin/sh
+set -e
 
 # /etc/init.d/ssh: start and stop the OpenBSD "secure shell(tm)" daemon
 
 test -x /usr/sbin/sshd || exit 0
 ( /usr/sbin/sshd -\? 2>&1 | grep -q OpenSSH ) 2>/dev/null || exit 0
 
+if test -f /etc/default/ssh; then
+    . /etc/default/ssh
+fi
+
 check_for_no_start() {
     # forget it if we're trying to start, and /etc/ssh/sshd_not_to_be_run exists
     if [ -e /etc/ssh/sshd_not_to_be_run ]; then 
@@ -32,7 +37,7 @@ case "$1" in
         check_for_no_start
         check_privsep_dir
         echo -n "Starting OpenBSD Secure Shell server: sshd"
-        start-stop-daemon --start --quiet --pidfile /var/run/sshd.pid --exec /usr/sbin/sshd
+        start-stop-daemon --start --quiet --pidfile /var/run/sshd.pid --exec /usr/sbin/sshd -- $SSHD_OPTS
         echo "."
         ;;
   stop)
@@ -56,7 +61,7 @@ case "$1" in
         check_for_no_start
         check_privsep_dir
         sleep 2
-        start-stop-daemon --start --quiet --pidfile /var/run/sshd.pid --exec /usr/sbin/sshd
+        start-stop-daemon --start --quiet --pidfile /var/run/sshd.pid --exec /usr/sbin/sshd -- $SSHD_OPTS
         echo "."
         ;;
 
diff --git a/debian/rules b/debian/rules
index 42ecea8ef..5b91fdde7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,11 +19,16 @@ build-stamp:
         then mv version.h version.h.upstream; mv version.h.new version.h; \
         else echo "Version number change failed"; exit 1; \
         fi
-        ./configure --prefix=/usr --sysconfdir=/etc/ssh --libexecdir=/usr/lib --mandir=/usr/share/man --with-tcp-wrappers --with-xauth=/usr/bin/X11/xauth --with-default-path=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin --with-pam --with-4in6 --with-ipv4-default \
+        ./configure --prefix=/usr --sysconfdir=/etc/ssh --libexecdir=/usr/lib --mandir=/usr/share/man --with-tcp-wrappers --with-xauth=/usr/bin/X11/xauth --with-default-path=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin --with-superuser-path=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin --with-pam --with-4in6 --with-ipv4-default \
                 --with-privsep-path=/var/run/sshd  --without-rand-helper
         $(MAKE) -j 2 ASKPASS_PROGRAM='/usr/bin/ssh-askpass' CFLAGS='-O2 -g -Wall -DLOGIN_PROGRAM=\"/bin/login\" -DLOGIN_NO_ENDOPT -DSSHD_PAM_SERVICE=\"ssh\" -D__FILE_OFFSET_BITS=64 -DHAVE_MMAP_ANON_SHARED' \
                 SSH_KEYSIGN='/usr/lib/ssh-keysign'
-        $(MAKE) -C contrib gnome-ssh-askpass1 CC='gcc -O2'
+        # Support building on Debian 3.0 (with GNOME 1.4) and later.
+        if [ -f /usr/include/libgnomeui-2.0/gnome.h ]; then \
+                $(MAKE) -C contrib gnome-ssh-askpass2 CC='gcc -O2'; \
+        elif [ -f /usr/include/gnome-1.0/gnome.h ]; then \
+                $(MAKE) -C contrib gnome-ssh-askpass1 CC='gcc -O2'; \
+        fi
 
         touch build-stamp
 
@@ -54,13 +59,18 @@ install: build
         install -m 755 contrib/ssh-copy-id debian/tmp/usr/bin/ssh-copy-id
         install -m 644 -c contrib/ssh-copy-id.1 debian/tmp/usr/share/man/man1/ssh-copy-id.1
 
-        install -s -o root -g root -m 755 contrib/gnome-ssh-askpass1 debian/ssh-askpass-gnome/usr/lib/ssh/gnome-ssh-askpass
+        if [ -f contrib/gnome-ssh-askpass2 ]; then \
+                install -s -o root -g root -m 755 contrib/gnome-ssh-askpass2 debian/ssh-askpass-gnome/usr/lib/ssh/gnome-ssh-askpass; \
+        elif [ -f contrib/gnome-ssh-askpass1 ]; then \
+                install -s -o root -g root -m 755 contrib/gnome-ssh-askpass1 debian/ssh-askpass-gnome/usr/lib/ssh/gnome-ssh-askpass; \
+        fi
         install -m 644 debian/gnome-ssh-askpass.1 debian/ssh-askpass-gnome/usr/share/man/man1/gnome-ssh-askpass.1
 
         install -m 755 debian/ssh-argv0 debian/tmp/usr/bin/ssh-argv0
         install -m 644 debian/ssh-argv0.1 debian/tmp/usr/share/man/man1/ssh-argv0.1
 
         install -o root -g root debian/init debian/tmp/etc/init.d/ssh
+        install -o root -g root debian/ssh.default debian/tmp/etc/default/ssh
 
         install -o root -g root -m 755 -d debian/tmp/var/run/sshd
 
diff --git a/debian/ssh.default b/debian/ssh.default
new file mode 100644
index 000000000..15305579b
--- /dev/null
+++ b/debian/ssh.default
@@ -0,0 +1,6 @@
+#! /bin/sh
+# Default settings for ssh. This file is sourced by the shell from
+# /etc/init.d/ssh.
+
+# Options to pass to sshd
+SSHD_OPTS=