diff options
Diffstat (limited to 'debian')
-rw-r--r-- | debian/README.Debian | 3 | ||||
-rw-r--r-- | debian/changelog | 17 | ||||
-rw-r--r-- | debian/control | 9 | ||||
-rw-r--r-- | debian/copyright.head | 2 | ||||
-rwxr-xr-x | debian/rules | 9 |
5 files changed, 27 insertions, 13 deletions
diff --git a/debian/README.Debian b/debian/README.Debian index fd969d7c9..614dd08f6 100644 --- a/debian/README.Debian +++ b/debian/README.Debian | |||
@@ -114,6 +114,9 @@ root, before enabling X11. I strongly recommend that you do this on a | |||
114 | machine-by-machine basis, rather than just enabling it in the default | 114 | machine-by-machine basis, rather than just enabling it in the default |
115 | host settings. | 115 | host settings. |
116 | 116 | ||
117 | In order for X11 forwarding to work, you need to install xauth on the | ||
118 | server. In Debian this is in the xbase-clients package. | ||
119 | |||
117 | Authorization Forwarding: | 120 | Authorization Forwarding: |
118 | ------------------------- | 121 | ------------------------- |
119 | Similarly, root on a remote server could make use of your ssh-agent | 122 | Similarly, root on a remote server could make use of your ssh-agent |
diff --git a/debian/changelog b/debian/changelog index 71a950772..e5651eb28 100644 --- a/debian/changelog +++ b/debian/changelog | |||
@@ -1,3 +1,20 @@ | |||
1 | openssh (1:3.4p1-4) unstable; urgency=low | ||
2 | |||
3 | * Allow ssh-krb5 in ssh-askpass-gnome's dependencies (closes: #129532). | ||
4 | * Restore Russia to list of countries where encryption is problematic (see | ||
5 | #148951 and http://www.average.org/freecrypto/). | ||
6 | * Drop ssh-askpass-gnome's priority to optional, per the override file. | ||
7 | * Drop the PAM special case for hurd-i386 (closes: #99157). | ||
8 | * s/dile/idle/ in ssh_config(5) (closes: #118331). | ||
9 | * Note in README.Debian that you need xauth from xbase-clients on the | ||
10 | server for X11 forwarding (closes: #140269). | ||
11 | * Use correct path to upstream README in copyright file (closes: #146037). | ||
12 | * Document the units for ProtocolKeepAlives (closes: #159479). | ||
13 | * Backport upstream patch to fix hostbased auth (closes: #117114). | ||
14 | * Add -g to CFLAGS. | ||
15 | |||
16 | -- Colin Watson <cjwatson@debian.org> Sun, 13 Oct 2002 18:58:53 +0100 | ||
17 | |||
1 | openssh (1:3.4p1-3) unstable; urgency=low | 18 | openssh (1:3.4p1-3) unstable; urgency=low |
2 | 19 | ||
3 | * Add myself to Uploaders: and begin acting as temporary maintainer, at | 20 | * Add myself to Uploaders: and begin acting as temporary maintainer, at |
diff --git a/debian/control b/debian/control index acda7997a..2fe062623 100644 --- a/debian/control +++ b/debian/control | |||
@@ -8,7 +8,7 @@ Uploaders: Colin Watson <cjwatson@debian.org> | |||
8 | 8 | ||
9 | Package: ssh | 9 | Package: ssh |
10 | Architecture: any | 10 | Architecture: any |
11 | Depends: ${shlibs:Depends}, ${pam-depend}, debconf, adduser | 11 | Depends: ${shlibs:Depends}, libpam-modules (>= 0.72-9), debconf, adduser |
12 | Conflicts: ssh-nonfree (<<2), ssh-socks, ssh2, debconf (<<0.2.17), debconf-tiny (<<0.2.17), sftp, rsh-client (<<0.16.1-1) | 12 | Conflicts: ssh-nonfree (<<2), ssh-socks, ssh2, debconf (<<0.2.17), debconf-tiny (<<0.2.17), sftp, rsh-client (<<0.16.1-1) |
13 | Suggests: ssh-askpass, xbase-clients, dpkg (>=1.8.3.1), dnsutils | 13 | Suggests: ssh-askpass, xbase-clients, dpkg (>=1.8.3.1), dnsutils |
14 | Provides: rsh-client | 14 | Provides: rsh-client |
@@ -27,13 +27,14 @@ Description: Secure rlogin/rsh/rcp replacement (OpenSSH) | |||
27 | . | 27 | . |
28 | -------------------------------------------------------------------- | 28 | -------------------------------------------------------------------- |
29 | . | 29 | . |
30 | In some countries, particularly Iraq, and Pakistan, it may be illegal | 30 | In some countries, particularly Russia, Iraq, and Pakistan, it may |
31 | to use any encryption at all without a special permit. | 31 | be illegal to use any encryption at all without a special permit. |
32 | 32 | ||
33 | Package: ssh-askpass-gnome | 33 | Package: ssh-askpass-gnome |
34 | Section: x11 | 34 | Section: x11 |
35 | Priority: optional | ||
35 | Architecture: any | 36 | Architecture: any |
36 | Depends: ${shlibs:Depends}, ssh (>=1:1.2pre7-4) | 37 | Depends: ${shlibs:Depends}, ssh (>=1:1.2pre7-4) | ssh-krb5 |
37 | Provides: ssh-askpass | 38 | Provides: ssh-askpass |
38 | Description: under X, asks user for a passphrase for ssh-add | 39 | Description: under X, asks user for a passphrase for ssh-add |
39 | This has been split out of the main ssh package, so that the ssh will | 40 | This has been split out of the main ssh package, so that the ssh will |
diff --git a/debian/copyright.head b/debian/copyright.head index cd4d45b24..1e1282f98 100644 --- a/debian/copyright.head +++ b/debian/copyright.head | |||
@@ -17,7 +17,7 @@ branch that is being maintained by the OpenBSD team (starting from | |||
17 | the last version of SSH that was distributed under a free license), | 17 | the last version of SSH that was distributed under a free license), |
18 | and porting work by Damien Miller <damien@ibs.com.au> to get it | 18 | and porting work by Damien Miller <damien@ibs.com.au> to get it |
19 | working on Linux. Other people also contributed to this, and are | 19 | working on Linux. Other people also contributed to this, and are |
20 | credited in README.openssh. | 20 | credited in /usr/share/doc/ssh/README. |
21 | 21 | ||
22 | Copyright: | 22 | Copyright: |
23 | 23 | ||
diff --git a/debian/rules b/debian/rules index 365872d3d..7615c8708 100755 --- a/debian/rules +++ b/debian/rules | |||
@@ -11,8 +11,6 @@ export DH_OPTIONS | |||
11 | 11 | ||
12 | #PKG_VER = $(shell perl -e 'print <> =~ /\((.*)\)/' debian/changelog) | 12 | #PKG_VER = $(shell perl -e 'print <> =~ /\((.*)\)/' debian/changelog) |
13 | 13 | ||
14 | DEB_HOST_ARCH = $(shell dpkg-architecture -qDEB_HOST_ARCH) | ||
15 | |||
16 | build: build-stamp | 14 | build: build-stamp |
17 | build-stamp: | 15 | build-stamp: |
18 | dh_testdir | 16 | dh_testdir |
@@ -23,7 +21,7 @@ build-stamp: | |||
23 | fi | 21 | fi |
24 | ./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-pam --with-4in6 --with-ipv4-default \ |
25 | --with-privsep-path=/var/run/sshd --without-rand-helper | 23 | --with-privsep-path=/var/run/sshd --without-rand-helper |
26 | $(MAKE) -j 2 ASKPASS_PROGRAM='/usr/bin/ssh-askpass' CFLAGS='-O2 -Wall -DLOGIN_PROGRAM=\"/bin/login\" -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\" -DSSHD_PAM_SERVICE=\"ssh\" -D__FILE_OFFSET_BITS=64 -DHAVE_MMAP_ANON_SHARED' \ |
27 | SSH_KEYSIGN='/usr/lib/ssh-keysign' | 25 | SSH_KEYSIGN='/usr/lib/ssh-keysign' |
28 | gcc -O2 `gnome-config --cflags gnome gnomeui` \ | 26 | gcc -O2 `gnome-config --cflags gnome gnomeui` \ |
29 | contrib/gnome-ssh-askpass.c -o contrib/gnome-ssh-askpass \ | 27 | contrib/gnome-ssh-askpass.c -o contrib/gnome-ssh-askpass \ |
@@ -93,11 +91,6 @@ binary-arch: build install | |||
93 | test ! -e debian/tmp/etc/ssh/ssh_prng_cmds \ | 91 | test ! -e debian/tmp/etc/ssh/ssh_prng_cmds \ |
94 | || echo "/etc/ssh/ssh_prng_cmds" >> debian/tmp/DEBIAN/conffiles | 92 | || echo "/etc/ssh/ssh_prng_cmds" >> debian/tmp/DEBIAN/conffiles |
95 | dh_shlibdeps | 93 | dh_shlibdeps |
96 | ifeq ($(DEB_HOST_ARCH),hurd-i386) | ||
97 | echo "pam-depend=" >> debian/substvars | ||
98 | else | ||
99 | echo "pam-depend=libpam-modules (>= 0.72-9), " >> debian/substvars | ||
100 | endif | ||
101 | dh_gencontrol | 94 | dh_gencontrol |
102 | dh_md5sums | 95 | dh_md5sums |
103 | dh_builddeb | 96 | dh_builddeb |