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
     than O_RDWR.
   * Disable OOM adjustment for vserver/OpenVZ (thanks, Karl Chen; closes:
     #511771).
+  * Add ufw integration (thanks, Didier Roche; see
+    https://wiki.ubuntu.com/UbuntuFirewall#Integrating%20UFW%20with%20Packages;
+    LP: #261884).
 
  -- Colin Watson <cjwatson@debian.org>  Wed, 14 Jan 2009 11:30:07 +0000
 
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 (>=
 Recommends: xauth, openssh-blacklist-extra
 Conflicts: 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)
 Replaces: ssh, openssh-client (<< 1:3.8.1p1-11), ssh-krb5
-Suggests: ssh-askpass, rssh, molly-guard
+Suggests: ssh-askpass, rssh, molly-guard, ufw
 Provides: ssh-server
 Description: secure shell server, an rshd replacement
  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 @@
 etc/init.d
 etc/default
 etc/network/if-up.d
+etc/ufw/applications.d
 usr/lib/openssh
 usr/sbin
 usr/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 @@
+[OpenSSH]
+title=Secure shell server, an rshd replacement
+description=OpenSSH is a free implementation of the Secure Shell protocol.
+ports=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
         install -o root -g root debian/openssh-server.init debian/openssh-server/etc/init.d/ssh
         install -o root -g root -m 644 debian/openssh-server.default debian/openssh-server/etc/default/ssh
         install -o root -g root debian/openssh-server.if-up debian/openssh-server/etc/network/if-up.d/openssh-server
+        install -o root -g root -m 644 debian/openssh-server.ufw.profile debian/openssh-server/etc/ufw/applications.d/openssh-server
 
         install -m 755 build-udeb/ssh debian/openssh-client-udeb/usr/bin/ssh
         install -m 755 build-udeb/scp debian/openssh-client-udeb/usr/bin/scp