Merge lp:~andreserl/ubuntu/lucid/net-snmp/net-snmp-apport-533603 into lp:ubuntu/lucid/net-snmp

[Andres Rodriguez]

Add apport hook.

=== modified file 'debian/changelog'
--- debian/changelog	2009-12-12 08:05:50 +0000
+++ debian/changelog	2010-03-28 04:37:18 +0000
@@ -1,3 +1,14 @@
+net-snmp (5.4.2.1~dfsg0ubuntu1-0ubuntu2) lucid; urgency=low
+
+  * Add apport hook (LP: #533603):
+    - debian/{snmp,snmpd}.apport: Added.
+    - debian/control: Build-depends on dh-apport.
+    - debian/rules: 
+      + Add --with apport.
+      + override_dh_apport to install hook on snmpd package only.
+
+ -- Andres Rodriguez <[e-mail]>  Sun, 28 Mar 2010 00:25:13 -0400
+
 net-snmp (5.4.2.1~dfsg0ubuntu1-0ubuntu1) lucid; urgency=low
 
   * Repackage upstream tarball to re-add the MIBs: even if they are not

=== modified file 'debian/control'
--- debian/control	2009-11-26 01:27:00 +0000
+++ debian/control	2010-03-28 04:37:18 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Ubuntu Core Developers <[e-mail]>
 XSBC-Original-Maintainer: Net-SNMP Packaging Team <[e-mail]>
-Build-Depends: debhelper (>= 7.0.50~), libtool, libwrap0-dev, libssl-dev (>> 0.9.8), perl (>=5.8), libperl-dev, python-all-dev, python-central (>=0.5.6), python (>=2.3.5-7), python-setuptools (>=0.6b3), autoconf, automake1.9, autotools-dev, debianutils (>=1.13.1), bash (>=2.05), findutils (>=4.1.20), procps, quilt, libkvm-dev [kfreebsd-i386 kfreebsd-amd64], libsensors4-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]
+Build-Depends: debhelper (>= 7.0.50~), libtool, libwrap0-dev, libssl-dev (>> 0.9.8), perl (>=5.8), libperl-dev, python-all-dev, python-central (>=0.5.6), python (>=2.3.5-7), python-setuptools (>=0.6b3), autoconf, automake1.9, autotools-dev, debianutils (>=1.13.1), bash (>=2.05), findutils (>=4.1.20), procps, quilt, libkvm-dev [kfreebsd-i386 kfreebsd-amd64], libsensors4-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], dh-apport
 Standards-Version: 3.8.3
 Vcs-Svn: svn://svn.debian.org/pkg-net-snmp/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-net-snmp/

=== modified file 'debian/rules'
--- debian/rules	2009-12-12 08:05:27 +0000
+++ debian/rules	2010-03-28 04:37:18 +0000
@@ -23,7 +23,7 @@
 endif
 
 %:
-	dh --with quilt,python-central $@
+	dh --with quilt,python-central,apport $@
 
 .PHONY: override_dh_auto_configure
 override_dh_auto_configure:
@@ -118,6 +118,10 @@
 override_dh_installinit:
 	dh_installinit -u"start 20 2 3 4 5 . stop 20 1 ."
 
+.PHONY: override_dh_apport
+override_dh_apport:
+	dh_apport -psnmpd
+
 debian/python-build-stamp-%:
 	# Build python modules manually as the net-snmp Makefile is too limited.
 	cd python; python$* setup.py build --basedir=$(CURDIR)

=== added file 'debian/source.apport'
--- debian/source.apport	1970-01-01 00:00:00 +0000
+++ debian/source.apport	2010-03-28 04:37:18 +0000
@@ -0,0 +1,36 @@
+#!/usr/bin/python
+
+'''apport hook for net-snmp
+
+(c) 2010 Andres Rodriguez
+Author: Andres Rodriguez <[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 *
+import re
+
+def add_info(report, ui):
+    response = ui.yesno("The contents of your /etc/snmp/snmpd.conf and "
+                        "your /etc/snmp/snmptrapd.conf files 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, 'snmpd')
+
+        # get version
+        report['SNMPVersion'] = root_command_output(['/usr/sbin/snmpd', '-v'])
+
+        # get syslog stuff
+        report['SyslogSnmpd'] = recent_syslog(re.compile('snmpd\['))
+        report['SyslogSnmptrapd'] = recent_syslog(re.compile('snmptrapd\['))