summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2003-09-01 18:30:12 +0000
committerColin Watson <cjwatson@debian.org>2003-09-01 18:30:12 +0000
commitf045c69060bfdd5cf8759a5f29d7008d02e4de5b (patch)
tree2c0e43be70a2fad5141eaf1885483ae54705ec3e
parent7eff9df1678223e1a3427ba621f6c379386f9cce (diff)
Debian release 3.5p1-5.
-rw-r--r--debian/changelog14
-rw-r--r--debian/conffiles1
-rw-r--r--debian/control2
-rw-r--r--debian/dirs1
-rw-r--r--debian/init9
-rwxr-xr-xdebian/rules16
-rw-r--r--debian/ssh.default6
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 @@
1openssh (1:3.5p1-5) unstable; urgency=low
2
3 * Add /etc/default/ssh (closes: #161049).
4 * Run the init script under 'set -e' (closes: #175010).
5 * Change the default superuser path to include /sbin, /usr/sbin, and
6 /usr/local/sbin (closes: #128235, #151267). Using login.defs would be
7 nice, but that belongs to another package. Without a defined API to
8 retrieve its settings, parsing it is off-limits.
9 * Build ssh-askpass-gnome with GNOME 2. The source package should still
10 support building on stable with GNOME 1, using the alternate
11 libgnome-dev build-dependency (thanks, Colin Walters; closes: #167582).
12
13 -- Colin Watson <cjwatson@debian.org> Sun, 9 Mar 2003 20:12:10 +0000
14
1openssh (1:3.5p1-4) unstable; urgency=low 15openssh (1:3.5p1-4) unstable; urgency=low
2 16
3 * Point rlogin and rcp alternatives at slogin and scp respectively rather 17 * 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 @@
2/etc/ssh/moduli 2/etc/ssh/moduli
3/etc/init.d/ssh 3/etc/init.d/ssh
4/etc/pam.d/ssh 4/etc/pam.d/ssh
5/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
2Section: net 2Section: net
3Priority: standard 3Priority: standard
4Maintainer: Matthew Vernon <matthew@debian.org> 4Maintainer: Matthew Vernon <matthew@debian.org>
5Build-Depends: libwrap0-dev | libwrap-dev, zlib1g-dev | libz-dev, libssl-dev, libpam0g-dev | libpam-dev, libgnome-dev, groff, debhelper (>=1.1.17), sharutils 5Build-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
6Standards-Version: 3.5.6 6Standards-Version: 3.5.6
7Uploaders: Colin Watson <cjwatson@debian.org> 7Uploaders: Colin Watson <cjwatson@debian.org>
8 8
diff --git a/debian/dirs b/debian/dirs
index 00a019411..1496845fc 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -3,5 +3,6 @@ usr/sbin
3usr/lib 3usr/lib
4etc/ssh 4etc/ssh
5etc/init.d 5etc/init.d
6etc/default
6usr/share/man/man1 7usr/share/man/man1
7usr/share/man/man8 8usr/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 @@
1#! /bin/sh 1#! /bin/sh
2set -e
2 3
3# /etc/init.d/ssh: start and stop the OpenBSD "secure shell(tm)" daemon 4# /etc/init.d/ssh: start and stop the OpenBSD "secure shell(tm)" daemon
4 5
5test -x /usr/sbin/sshd || exit 0 6test -x /usr/sbin/sshd || exit 0
6( /usr/sbin/sshd -\? 2>&1 | grep -q OpenSSH ) 2>/dev/null || exit 0 7( /usr/sbin/sshd -\? 2>&1 | grep -q OpenSSH ) 2>/dev/null || exit 0
7 8
9if test -f /etc/default/ssh; then
10 . /etc/default/ssh
11fi
12
8check_for_no_start() { 13check_for_no_start() {
9 # forget it if we're trying to start, and /etc/ssh/sshd_not_to_be_run exists 14 # forget it if we're trying to start, and /etc/ssh/sshd_not_to_be_run exists
10 if [ -e /etc/ssh/sshd_not_to_be_run ]; then 15 if [ -e /etc/ssh/sshd_not_to_be_run ]; then
@@ -32,7 +37,7 @@ case "$1" in
32 check_for_no_start 37 check_for_no_start
33 check_privsep_dir 38 check_privsep_dir
34 echo -n "Starting OpenBSD Secure Shell server: sshd" 39 echo -n "Starting OpenBSD Secure Shell server: sshd"
35 start-stop-daemon --start --quiet --pidfile /var/run/sshd.pid --exec /usr/sbin/sshd 40 start-stop-daemon --start --quiet --pidfile /var/run/sshd.pid --exec /usr/sbin/sshd -- $SSHD_OPTS
36 echo "." 41 echo "."
37 ;; 42 ;;
38 stop) 43 stop)
@@ -56,7 +61,7 @@ case "$1" in
56 check_for_no_start 61 check_for_no_start
57 check_privsep_dir 62 check_privsep_dir
58 sleep 2 63 sleep 2
59 start-stop-daemon --start --quiet --pidfile /var/run/sshd.pid --exec /usr/sbin/sshd 64 start-stop-daemon --start --quiet --pidfile /var/run/sshd.pid --exec /usr/sbin/sshd -- $SSHD_OPTS
60 echo "." 65 echo "."
61 ;; 66 ;;
62 67
diff --git a/debian/rules b/debian/rules
index 42ecea8ef..5b91fdde7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,11 +19,16 @@ build-stamp:
19 then mv version.h version.h.upstream; mv version.h.new version.h; \ 19 then mv version.h version.h.upstream; mv version.h.new version.h; \
20 else echo "Version number change failed"; exit 1; \ 20 else echo "Version number change failed"; exit 1; \
21 fi 21 fi
22 ./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 \ 22 ./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 \
23 --with-privsep-path=/var/run/sshd --without-rand-helper 23 --with-privsep-path=/var/run/sshd --without-rand-helper
24 $(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' \ 24 $(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' \
25 SSH_KEYSIGN='/usr/lib/ssh-keysign' 25 SSH_KEYSIGN='/usr/lib/ssh-keysign'
26 $(MAKE) -C contrib gnome-ssh-askpass1 CC='gcc -O2' 26 # Support building on Debian 3.0 (with GNOME 1.4) and later.
27 if [ -f /usr/include/libgnomeui-2.0/gnome.h ]; then \
28 $(MAKE) -C contrib gnome-ssh-askpass2 CC='gcc -O2'; \
29 elif [ -f /usr/include/gnome-1.0/gnome.h ]; then \
30 $(MAKE) -C contrib gnome-ssh-askpass1 CC='gcc -O2'; \
31 fi
27 32
28 touch build-stamp 33 touch build-stamp
29 34
@@ -54,13 +59,18 @@ install: build
54 install -m 755 contrib/ssh-copy-id debian/tmp/usr/bin/ssh-copy-id 59 install -m 755 contrib/ssh-copy-id debian/tmp/usr/bin/ssh-copy-id
55 install -m 644 -c contrib/ssh-copy-id.1 debian/tmp/usr/share/man/man1/ssh-copy-id.1 60 install -m 644 -c contrib/ssh-copy-id.1 debian/tmp/usr/share/man/man1/ssh-copy-id.1
56 61
57 install -s -o root -g root -m 755 contrib/gnome-ssh-askpass1 debian/ssh-askpass-gnome/usr/lib/ssh/gnome-ssh-askpass 62 if [ -f contrib/gnome-ssh-askpass2 ]; then \
63 install -s -o root -g root -m 755 contrib/gnome-ssh-askpass2 debian/ssh-askpass-gnome/usr/lib/ssh/gnome-ssh-askpass; \
64 elif [ -f contrib/gnome-ssh-askpass1 ]; then \
65 install -s -o root -g root -m 755 contrib/gnome-ssh-askpass1 debian/ssh-askpass-gnome/usr/lib/ssh/gnome-ssh-askpass; \
66 fi
58 install -m 644 debian/gnome-ssh-askpass.1 debian/ssh-askpass-gnome/usr/share/man/man1/gnome-ssh-askpass.1 67 install -m 644 debian/gnome-ssh-askpass.1 debian/ssh-askpass-gnome/usr/share/man/man1/gnome-ssh-askpass.1
59 68
60 install -m 755 debian/ssh-argv0 debian/tmp/usr/bin/ssh-argv0 69 install -m 755 debian/ssh-argv0 debian/tmp/usr/bin/ssh-argv0
61 install -m 644 debian/ssh-argv0.1 debian/tmp/usr/share/man/man1/ssh-argv0.1 70 install -m 644 debian/ssh-argv0.1 debian/tmp/usr/share/man/man1/ssh-argv0.1
62 71
63 install -o root -g root debian/init debian/tmp/etc/init.d/ssh 72 install -o root -g root debian/init debian/tmp/etc/init.d/ssh
73 install -o root -g root debian/ssh.default debian/tmp/etc/default/ssh
64 74
65 install -o root -g root -m 755 -d debian/tmp/var/run/sshd 75 install -o root -g root -m 755 -d debian/tmp/var/run/sshd
66 76
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 @@
1#! /bin/sh
2# Default settings for ssh. This file is sourced by the shell from
3# /etc/init.d/ssh.
4
5# Options to pass to sshd
6SSHD_OPTS=