summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog3
-rw-r--r--debian/control2
-rw-r--r--debian/openssh-server.dirs1
-rw-r--r--debian/openssh-server.ufw.profile4
-rwxr-xr-xdebian/rules1
5 files changed, 10 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index fca432400..7e1076d1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ openssh (1:5.1p1-6) UNRELEASED; urgency=low
4 than O_RDWR. 4 than O_RDWR.
5 * Disable OOM adjustment for vserver/OpenVZ (thanks, Karl Chen; closes: 5 * Disable OOM adjustment for vserver/OpenVZ (thanks, Karl Chen; closes:
6 #511771). 6 #511771).
7 * Add ufw integration (thanks, Didier Roche; see
8 https://wiki.ubuntu.com/UbuntuFirewall#Integrating%20UFW%20with%20Packages;
9 LP: #261884).
7 10
8 -- Colin Watson <cjwatson@debian.org> Wed, 14 Jan 2009 11:30:07 +0000 11 -- Colin Watson <cjwatson@debian.org> Wed, 14 Jan 2009 11:30:07 +0000
9 12
diff --git a/debian/control b/debian/control
index d87025778..4e2875637 100644
--- a/debian/control
+++ b/debian/control
@@ -41,7 +41,7 @@ Depends: ${shlibs:Depends}, debconf (>= 1.2.0) | debconf-2.0, libpam-runtime (>=
41Recommends: xauth, openssh-blacklist-extra 41Recommends: xauth, openssh-blacklist-extra
42Conflicts: ssh (<< 1:3.8.1p1-9), ssh-nonfree (<<2), ssh-socks, ssh2, sftp, rsh-client (<<0.16.1-1), ssh-krb5 (<< 1:4.3p2-7) 42Conflicts: ssh (<< 1:3.8.1p1-9), ssh-nonfree (<<2), ssh-socks, ssh2, sftp, rsh-client (<<0.16.1-1), ssh-krb5 (<< 1:4.3p2-7)
43Replaces: ssh, openssh-client (<< 1:3.8.1p1-11), ssh-krb5 43Replaces: ssh, openssh-client (<< 1:3.8.1p1-11), ssh-krb5
44Suggests: ssh-askpass, rssh, molly-guard 44Suggests: ssh-askpass, rssh, molly-guard, ufw
45Provides: ssh-server 45Provides: ssh-server
46Description: secure shell server, an rshd replacement 46Description: secure shell server, an rshd replacement
47 This is the portable version of OpenSSH, a free implementation of 47 This is the portable version of OpenSSH, a free implementation of
diff --git a/debian/openssh-server.dirs b/debian/openssh-server.dirs
index ebc620ea9..c687ea999 100644
--- a/debian/openssh-server.dirs
+++ b/debian/openssh-server.dirs
@@ -1,6 +1,7 @@
1etc/init.d 1etc/init.d
2etc/default 2etc/default
3etc/network/if-up.d 3etc/network/if-up.d
4etc/ufw/applications.d
4usr/lib/openssh 5usr/lib/openssh
5usr/sbin 6usr/sbin
6usr/share/lintian/overrides 7usr/share/lintian/overrides
diff --git a/debian/openssh-server.ufw.profile b/debian/openssh-server.ufw.profile
new file mode 100644
index 000000000..9bbe906bc
--- /dev/null
+++ b/debian/openssh-server.ufw.profile
@@ -0,0 +1,4 @@
1[OpenSSH]
2title=Secure shell server, an rshd replacement
3description=OpenSSH is a free implementation of the Secure Shell protocol.
4ports=22/tcp
diff --git a/debian/rules b/debian/rules
index 39bd33f12..e85ff654b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -189,6 +189,7 @@ install: build
189 install -o root -g root debian/openssh-server.init debian/openssh-server/etc/init.d/ssh 189 install -o root -g root debian/openssh-server.init debian/openssh-server/etc/init.d/ssh
190 install -o root -g root -m 644 debian/openssh-server.default debian/openssh-server/etc/default/ssh 190 install -o root -g root -m 644 debian/openssh-server.default debian/openssh-server/etc/default/ssh
191 install -o root -g root debian/openssh-server.if-up debian/openssh-server/etc/network/if-up.d/openssh-server 191 install -o root -g root debian/openssh-server.if-up debian/openssh-server/etc/network/if-up.d/openssh-server
192 install -o root -g root -m 644 debian/openssh-server.ufw.profile debian/openssh-server/etc/ufw/applications.d/openssh-server
192 193
193 install -m 755 build-udeb/ssh debian/openssh-client-udeb/usr/bin/ssh 194 install -m 755 build-udeb/ssh debian/openssh-client-udeb/usr/bin/ssh
194 install -m 755 build-udeb/scp debian/openssh-client-udeb/usr/bin/scp 195 install -m 755 build-udeb/scp debian/openssh-client-udeb/usr/bin/scp