[Pkg-shadow-devel] Ubuntu shadow 1:4.1.5.1-1ubuntu6

[Ubuntu Merge-o-Matic]

This e-mail has been sent due to an upload to Ubuntu that contains Ubuntu
changes.  It contains the difference between the new version and the
previous version of the same source package in Ubuntu.
-------------- next part --------------
Format: 1.8
Date: Fri, 26 Jul 2013 16:55:52 +0100
Source: shadow
Binary: passwd login uidmap
Architecture: source
Version: 1:4.1.5.1-1ubuntu6
Distribution: saucy
Urgency: low
Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
Changed-By: Colin Watson <cjwatson at ubuntu.com>
Description: 
 login      - system login tools
 passwd     - change and administer password and group data
 uidmap     - programs to help use subuids
Closes: 713979
Changes: 
 shadow (1:4.1.5.1-1ubuntu6) saucy; urgency=low
 .
   * debian/patches/496_su_kill_process_group: Kill the child process group,
     rather than just the immediate child; this is needed now that su no
     longer starts a controlling terminal when not running an interactive
     shell (closes: #713979).
Checksums-Sha1: 
 d316e552e21c219083229d3f561af1ff8d23f298 2425 shadow_4.1.5.1-1ubuntu6.dsc
 17ca145e2717ac9cd52c6d5908faf3e08c50da9d 110288 shadow_4.1.5.1-1ubuntu6.diff.gz
Checksums-Sha256: 
 dce09c1aa29749bda8b57ad598bd4c3bca62045427c91ba01e6a73d52705d4cf 2425 shadow_4.1.5.1-1ubuntu6.dsc
 c16b2d9b7f21ed60057816a248f9c089f9485fce0b9ec7ff5941f58a781e9218 110288 shadow_4.1.5.1-1ubuntu6.diff.gz
Files: 
 d7bcbecbed296f55942bbcb58cdd87f6 2425 admin required shadow_4.1.5.1-1ubuntu6.dsc
 0bbb251e02ce90c28d6c4c39a409262c 110288 admin required shadow_4.1.5.1-1ubuntu6.diff.gz
Original-Maintainer: Shadow package maintainers <pkg-shadow-devel at lists.alioth.debian.org>
-------------- next part --------------
diff -pruN 1:4.1.5.1-1ubuntu5/debian/changelog 1:4.1.5.1-1ubuntu6/debian/changelog
--- 1:4.1.5.1-1ubuntu5/debian/changelog	2013-07-26 18:36:12.000000000 +0000
+++ 1:4.1.5.1-1ubuntu6/debian/changelog	2013-07-26 18:36:11.000000000 +0000
@@ -1,3 +1,12 @@
+shadow (1:4.1.5.1-1ubuntu6) saucy; urgency=low
+
+  * debian/patches/496_su_kill_process_group: Kill the child process group,
+    rather than just the immediate child; this is needed now that su no
+    longer starts a controlling terminal when not running an interactive
+    shell (closes: #713979).
+
+ -- Colin Watson <cjwatson at ubuntu.com>  Fri, 26 Jul 2013 16:55:52 +0100
+
 shadow (1:4.1.5.1-1ubuntu5) saucy; urgency=low
 
   [ Serge Hallyn ]
diff -pruN 1:4.1.5.1-1ubuntu5/debian/patches/496_su_kill_process_group 1:4.1.5.1-1ubuntu6/debian/patches/496_su_kill_process_group
--- 1:4.1.5.1-1ubuntu5/debian/patches/496_su_kill_process_group	1970-01-01 00:00:00.000000000 +0000
+++ 1:4.1.5.1-1ubuntu6/debian/patches/496_su_kill_process_group	2013-07-26 18:36:11.000000000 +0000
@@ -0,0 +1,29 @@
+Description: su: Kill the child process group, not just the immediate child
+ This is needed now that su no longer starts a controlling terminal when not
+ running an interactive shell.
+Author: Colin Watson <cjwatson at ubuntu.com>
+Forwarded: no
+Last-Update: 2013-07-26
+
+Index: b/src/su.c
+===================================================================
+--- a/src/su.c
++++ b/src/su.c
+@@ -194,7 +194,7 @@
+ static RETSIGTYPE kill_child (int unused(s))
+ {
+ 	if (0 != pid_child) {
+-		(void) kill (pid_child, SIGKILL);
++		(void) kill (-pid_child, SIGKILL);
+ 		(void) fputs (_(" ...killed.\n"), stderr);
+ 	} else {
+ 		(void) fputs (_(" ...waiting for child to terminate.\n"),
+@@ -383,7 +383,7 @@
+ 		(void) fputs ("\n", stderr);
+ 		(void) fputs (_("Session terminated, terminating shell..."),
+ 		              stderr);
+-		(void) kill (pid_child, caught);
++		(void) kill (-pid_child, caught);
+ 	}
+ 
+ 	ret = pam_close_session (pamh, 0);
diff -pruN 1:4.1.5.1-1ubuntu5/debian/patches/series 1:4.1.5.1-1ubuntu6/debian/patches/series
--- 1:4.1.5.1-1ubuntu5/debian/patches/series	2013-07-26 18:36:12.000000000 +0000
+++ 1:4.1.5.1-1ubuntu6/debian/patches/series	2013-07-26 18:36:11.000000000 +0000
@@ -33,3 +33,4 @@ userns/13_subordinate_parse_static_buf
 userns/14_fix_getopt
 userns/manpagetypo
 userns/16_add-argument-sanity-checking.patch
+496_su_kill_process_group