Install apport hooks.

6 files changed, 68 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index a35c39b94..887cf0261 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ openssh (1:6.1p1-2) UNRELEASED; urgency=low
       need these installed by default nowadays.
     - Add an Upstart job (not currently used by default in Debian).
     - Add mention of ssh-keygen in ssh connect warning (Scott Moser).
+    - Install apport hooks.
   * Only build with -j if DEB_BUILD_OPTIONS=parallel=* is used (closes:
     #694282).
 
diff --git a/debian/openssh-client.apport b/debian/openssh-client.apport
new file mode 100644
index 000000000..3dbc8e5e6
--- /dev/null
+++ b/debian/openssh-client.apport
@@ -0,0 +1,32 @@
+#!/usr/bin/python
+
+'''apport hook for openssh-client
+
+(c) 2010 Canonical Ltd.
+Author: Chuck Short <chuck.short@canonical.com>
+
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2 of the License, or (at your
+option) any later version.  See http://www.gnu.org/copyleft/gpl.html for
+the full text of the license.
+'''
+
+from apport.hookutils import *
+
+def add_info(report, ui):
+    response = ui.yesno("The contents of your /etc/ssh/ssh_config file "
+                        "may help developers diagnose your bug more "
+                        "quickly.  However, it may contain sensitive "
+                        "information.  Do you want to include it in your "
+                        "bug report?")
+
+    if response == None: # user cancelled
+        raise StopIteration
+
+    elif response == True:
+        attach_conffiles(report, 'openssh-client')
+
+    attach_related_packages(report,
+        ['ssh-askpass', 'libpam-ssh', 'keychain', 'ssh-askpass-gnome'])
+    report['SSHClientVersion'] = command_output(['/usr/bin/ssh', '-V'])
diff --git a/debian/openssh-client.dirs b/debian/openssh-client.dirs
index 1da8fba83..44f9ef061 100644
--- a/debian/openssh-client.dirs
+++ b/debian/openssh-client.dirs
@@ -1 +1,2 @@
+usr/share/apport/package-hooks
 usr/share/lintian/overrides
diff --git a/debian/openssh-server.apport b/debian/openssh-server.apport
new file mode 100644
index 000000000..3644bd855
--- /dev/null
+++ b/debian/openssh-server.apport
@@ -0,0 +1,28 @@
+#!/usr/bin/python
+
+'''apport hook for openssh-server
+
+(c) 2010 Canonical Ltd.
+Author: Chuck Short <chuck.short@canonical.com>
+
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2 of the License, or (at your
+option) any later version.  See http://www.gnu.org/copyleft/gpl.html for
+the full text of the license.
+'''
+
+from apport.hookutils import *
+
+def add_info(report, ui):
+    response = ui.yesno("The contents of your /etc/ssh/sshd_config file "
+                        "may help developers diagnose your bug more "
+                        "quickly.  However, it may contain sensitive "
+                        "information.  Do you want to include it in your "
+                        "bug report?")
+
+    if response == None: # user cancelled
+        raise StopIteration
+
+    elif response == True:
+        report['SSHDConfig'] = root_command_output(['/usr/sbin/sshd', '-T'])
diff --git a/debian/openssh-server.dirs b/debian/openssh-server.dirs
index b008fbf2c..0ed9bea44 100644
--- a/debian/openssh-server.dirs
+++ b/debian/openssh-server.dirs
@@ -4,6 +4,7 @@ etc/network/if-up.d
 etc/ufw/applications.d
 usr/lib/openssh
 usr/sbin
+usr/share/apport/package-hooks
 usr/share/lintian/overrides
 usr/share/man/man5
 usr/share/man/man8
diff --git a/debian/rules b/debian/rules
index 5cf42b692..5ce29c3ed 100755
--- a/debian/rules
+++ b/debian/rules
@@ -182,6 +182,11 @@ override_dh_install: $(DISTRIBUTOR_REPLACE)
                 debian/openssh-client/etc/ssh/moduli \
                 debian/openssh-client/etc/ssh/ssh_config
 
+        # dh_apport would be neater, but at the time of writing it isn't in
+        # unstable yet.
+        install -p -m 644 debian/openssh-client.apport debian/openssh-client/usr/share/apport/package-hooks/openssh-client.py
+        install -p -m 644 debian/openssh-server.apport debian/openssh-server/usr/share/apport/package-hooks/openssh-server.py
+
 override_dh_installdocs:
         dh_installdocs -Nopenssh-server -Nssh
         dh_installdocs -popenssh-server -pssh --link-doc=openssh-client