Merge lp:~zulcss/ubuntu/lucid/openssh/openssh-apport-hook into lp:ubuntu/lucid/openssh

[Chuck Short]

[Chuck Short (zulcss)]

Adds apport hooks as per the server-lucid-apport-hooks spec.

[Colin Watson (cjwatson)]

I merged this (by diff/patch, since it was against the automatic import branch rather than the one I actually develop in), and made some changes to use dh_apport and fix up spelling and the like. Thanks!

review: Approve

=== added directory 'debian/apport'
=== added file 'debian/apport/openssh-client.py'
--- debian/apport/openssh-client.py	1970-01-01 00:00:00 +0000
+++ debian/apport/openssh-client.py	2010-02-08 21:39:12 +0000
@@ -0,0 +1,27 @@
+#!/usr/bin/python
+
+'''apport hook for openssh-client
+
+(c) 2010 Canonical Ltd.
+Author: Chuck Short <[e-mail]>
+
+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: #use cancelled
+		raise StopIteration
+
+	elif response == True:
+		attach_conffiles(report, 'openssh-client')
+		attach_related_packages(report, ['ssh-askpace', 'libpam-ssh', 'keychain',
+			'ssh-askpass-gnome'])
+		report['SSHClientVersion'] = command_output(['/usr/bin/ssh', '-V'])

=== added file 'debian/apport/openssh-server.py'
--- debian/apport/openssh-server.py	1970-01-01 00:00:00 +0000
+++ debian/apport/openssh-server.py	2010-02-08 21:39:12 +0000
@@ -0,0 +1,24 @@
+#!/usr/bin/python
+
+'''apport hook for openssh-server
+
+(c) 2010 Canonical Ltd.
+Author: Chuck Short <[e-mail]>
+
+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 content sensitive information. Do you want to include it in your bug report?")
+
+	if response == None: #user canceled
+		raise StopIteration
+
+	elif response == True:
+		report['SSHDConfig'] = root_command_output('/usr/sbin/sshd', '-T'])

=== modified file 'debian/changelog'
--- debian/changelog	2010-01-26 13:07:40 +0000
+++ debian/changelog	2010-02-08 21:39:12 +0000
@@ -1,3 +1,11 @@
+openssh (1:5.3p1-1ubuntu2) lucid; urgency=low
+
+  * debian/openssh-server.dirs, debian/openssh-client.dirs, debian/rules,
+    debian/apport/openssh-server.py, debian/apport/openssh-client.py: 
+    Install apport hook, apart of the server-lucid-apport-hooks specification. 
+
+ -- Chuck Short <[e-mail]>  Mon, 08 Feb 2010 16:16:14 -0500
+
 openssh (1:5.3p1-1ubuntu1) lucid; urgency=low
 
   * Resynchronise with Debian.  Remaining changes:

=== modified file 'debian/openssh-client.dirs'
--- debian/openssh-client.dirs	2005-10-10 20:10:01 +0000
+++ debian/openssh-client.dirs	2010-02-08 21:39:12 +0000
@@ -1,1 +1,2 @@
 usr/share/lintian/overrides
+usr/share/apport/package-hooks

=== modified file 'debian/openssh-server.dirs'
--- debian/openssh-server.dirs	2010-01-04 13:45:21 +0000
+++ debian/openssh-server.dirs	2010-02-08 21:39:12 +0000
@@ -8,3 +8,4 @@
 usr/share/lintian/overrides
 usr/share/man/man5
 usr/share/man/man8
+usr/share/apport/package-hooks

=== modified file 'debian/rules'
--- debian/rules	2010-01-26 13:07:40 +0000
+++ debian/rules	2010-02-08 21:39:12 +0000
@@ -199,6 +199,10 @@
 	install -m 755 build-udeb/sshd debian/openssh-server-udeb/usr/sbin/sshd
 	install -m 755 build-udeb/ssh-keygen debian/openssh-server-udeb/usr/bin/ssh-keygen
 
+	# apport hooks
+	install -D -m 644 debian/apport/openssh-server.py debian/openssh-server/usr/share/apport/package-hooks/openssh-server.py
+	install -D -m 644 debian/apport/openssh-client.py debian/openssh-client/usr/share/apport/package-hooks/openssh-client.py
+
 	# Remove version control tags to avoid unnecessary conffile
 	# resolution steps for administrators.
 	sed -i '/\$$OpenBSD:/d' \