Merge lp:~broder/ubuntu/maverick/update-inetd/fix-601732 into lp:ubuntu/maverick/update-inetd

[Evan Broder]

=== modified file 'DebianNet.pm'
--- DebianNet.pm	2009-09-20 16:51:37 +0000
+++ DebianNet.pm	2010-11-12 16:17:16 +0000
@@ -323,7 +323,13 @@
             &printv("About to $action inetd via invoke-rc.d\n");
             my $service = $1;
             unless ($fake_invocation) {
-                system("invoke-rc.d $service $action >/dev/null");
+		# If we were called by a shell script that also uses
+		# debconf, the pipe to the debconf frontend is fd 3 as
+		# well as fd 1 (stdout).  Ensure that fd 3 is not
+		# inherited by invoke-rc.d and inetd, as that will
+		# cause debconf to hang (bug #589487).  Don't let them
+		# confuse debconf via stdout either.
+                system("invoke-rc.d $service $action >/dev/null 3>&-");
             }
         }
     }

=== modified file 'debian/changelog'
--- debian/changelog	2010-02-13 18:50:20 +0000
+++ debian/changelog	2010-11-12 16:17:16 +0000
@@ -1,3 +1,10 @@
+update-inetd (4.36ubuntu0.1) maverick-proposed; urgency=low
+
+  * Workaround debconf hanging by closing fd 3 in invoke-rc.d invocation
+    (LP: #601732) Patch from Ben Hutchings <[e-mail]>
+
+ -- Evan Broder <[e-mail]>  Fri, 12 Nov 2010 08:07:22 -0800
+
 update-inetd (4.36) unstable; urgency=low
 
   * Remove "there are plans to support xinetd" from long description (see