Ubuntu
openssh package

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

  1. Lucid (10.04)
  2. openssh-apport-hook
  3. Merge into lucid
Proposed by Chuck Short
Status: Merged
Merge reported by: James Westby
Merged at revision: not available
Proposed branch: lp://staging/~zulcss/ubuntu/lucid/openssh/openssh-apport-hook
Merge into: lp://staging/ubuntu/lucid/openssh
Diff against target: 108 lines (+65/-0)
6 files modified
debian/apport/openssh-client.py (+27/-0)
debian/apport/openssh-server.py (+24/-0)
debian/changelog (+8/-0)
debian/openssh-client.dirs (+1/-0)
debian/openssh-server.dirs (+1/-0)
debian/rules (+4/-0)
To merge this branch: bzr merge lp://staging/~zulcss/ubuntu/lucid/openssh/openssh-apport-hook
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+18880@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Chuck Short (zulcss) wrote :

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

Revision history for this message
Colin Watson (cjwatson) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1#!/usr/bin/python
2
3'''apport hook for openssh-client
4
5(c) 2010 Canonical Ltd.
6Author: Chuck Short <chuck.short@canonical.com>
7
8This program is free software; you can redistribute it and/or modify it
9under the terms of the GNU General Public License as published by the
10Free Software Foundation; either version 2 of the License, or (at your
11option) any later version. See http://www.gnu.org/copyleft/gpl.html for
12the full text of the license.
13'''
14
15from apport.hookutils import *
16
17def add_info(report, ui):
18 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?")
19
20 if response == None: #use cancelled
21 raise StopIteration
22
23 elif response == True:
24 attach_conffiles(report, 'openssh-client')
25 attach_related_packages(report, ['ssh-askpace', 'libpam-ssh', 'keychain',
26 'ssh-askpass-gnome'])
27 report['SSHClientVersion'] = command_output(['/usr/bin/ssh', '-V'])
028
=== 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 @@
1#!/usr/bin/python
2
3'''apport hook for openssh-server
4
5(c) 2010 Canonical Ltd.
6Author: Chuck Short <chuck.short@canonical.com>
7
8This program is free software; you can redistribute it and/or modify it
9under the terms of the GNU General Public License as published by the
10Free Software Foundation; either version 2 of the License, or (at your
11option) any later version. See http://www.gnu.org/copyleft/gpl.html for
12the full text of the license.
13'''
14
15from apport.hookutils import *
16
17def add_info(report, ui):
18 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?")
19
20 if response == None: #user canceled
21 raise StopIteration
22
23 elif response == True:
24 report['SSHDConfig'] = root_command_output('/usr/sbin/sshd', '-T'])
025
=== 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 @@
1openssh (1:5.3p1-1ubuntu2) lucid; urgency=low
2
3 * debian/openssh-server.dirs, debian/openssh-client.dirs, debian/rules,
4 debian/apport/openssh-server.py, debian/apport/openssh-client.py:
5 Install apport hook, apart of the server-lucid-apport-hooks specification.
6
7 -- Chuck Short <zulcss@ubuntu.com> Mon, 08 Feb 2010 16:16:14 -0500
8
1openssh (1:5.3p1-1ubuntu1) lucid; urgency=low9openssh (1:5.3p1-1ubuntu1) lucid; urgency=low
210
3 * Resynchronise with Debian. Remaining changes:11 * Resynchronise with Debian. Remaining changes:
412
=== 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 @@
1usr/share/lintian/overrides1usr/share/lintian/overrides
2usr/share/apport/package-hooks
23
=== 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 @@
8usr/share/lintian/overrides8usr/share/lintian/overrides
9usr/share/man/man59usr/share/man/man5
10usr/share/man/man810usr/share/man/man8
11usr/share/apport/package-hooks
1112
=== 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 @@
199 install -m 755 build-udeb/sshd debian/openssh-server-udeb/usr/sbin/sshd199 install -m 755 build-udeb/sshd debian/openssh-server-udeb/usr/sbin/sshd
200 install -m 755 build-udeb/ssh-keygen debian/openssh-server-udeb/usr/bin/ssh-keygen200 install -m 755 build-udeb/ssh-keygen debian/openssh-server-udeb/usr/bin/ssh-keygen
201201
202 # apport hooks
203 install -D -m 644 debian/apport/openssh-server.py debian/openssh-server/usr/share/apport/package-hooks/openssh-server.py
204 install -D -m 644 debian/apport/openssh-client.py debian/openssh-client/usr/share/apport/package-hooks/openssh-client.py
205
202 # Remove version control tags to avoid unnecessary conffile206 # Remove version control tags to avoid unnecessary conffile
203 # resolution steps for administrators.207 # resolution steps for administrators.
204 sed -i '/\$$OpenBSD:/d' \208 sed -i '/\$$OpenBSD:/d' \

Subscribers

People subscribed via source and target branches

to all changes: