Merge lp:~andreserl/ubuntu/lucid/vsftpd/vsftpd-apport-531978 into lp:ubuntu/lucid/vsftpd

[Andres Rodriguez]

Added apport hook.

[Mathias Gug (mathiaz)]

Looks good to me.

[Mathias Gug (mathiaz)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2010-01-22 13:13:02 +0000
+++ debian/changelog	2010-03-10 20:12:16 +0000
@@ -1,3 +1,12 @@
+vsftpd (2.2.2-3ubuntu5) lucid; urgency=low
+
+  * Add apport hook (LP: #531978):
+    - debian/vsftpd.apport: Added.
+    - debian/control: Build-depends on dh-apport.
+    - debian/rules: Add --with apport.
+
+ -- Andres Rodriguez <[e-mail]>  Wed, 10 Mar 2010 14:56:12 -0500
+
 vsftpd (2.2.2-3ubuntu4) lucid; urgency=low
 
   * debian/vsftpd.upstart: Fix up upstart script. Thanks to Paul Elliott.

=== modified file 'debian/control'
--- debian/control	2010-01-05 10:01:25 +0000
+++ debian/control	2010-03-10 20:12:16 +0000
@@ -6,7 +6,7 @@
 Build-Depends:
  debhelper (>= 7.0.50~),
  libcap2-dev [!kfreebsd-amd64 !kfreebsd-i386 !hurd-i386], libpam0g-dev,
- libssl-dev, libwrap0-dev, quilt (>= 0.46-7)
+ libssl-dev, libwrap0-dev, quilt (>= 0.46-7), dh-apport
 Standards-Version: 3.8.3
 Homepage: http://vsftpd.beasts.org/
 Vcs-Browser: http://git.debian-maintainers.org/?p=daniel/vsftpd.git

=== modified file 'debian/rules'
--- debian/rules	2010-01-05 10:01:25 +0000
+++ debian/rules	2010-03-10 20:12:16 +0000
@@ -10,7 +10,7 @@
 endif
 
 %:
-	dh ${@} --with quilt
+	dh ${@} --with quilt,apport
 
 override_dh_auto_build:
 	$(MAKE) CFLAGS="$(CFLAGS) -W -Wshadow" LIBS="$(LIBS)" LINK=""

=== added file 'debian/vsftpd.apport'
--- debian/vsftpd.apport	1970-01-01 00:00:00 +0000
+++ debian/vsftpd.apport	2010-03-10 20:12:16 +0000
@@ -0,0 +1,30 @@
+#!/usr/bin/python
+
+'''apport hook for vsftpd
+
+(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 *
+
+def add_info(report, ui):
+    response = ui.yesno("The contents of your /etc/vsftpd.conf 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,'vsftpd')
+
+    attach_file_if_exists(report, os.path.expanduser('/var/log/vsftpd.log'), 'vsftpd.log')