Package: sudo Version: 1.8.9p5-1 Severity: normal Tags: patch Control: forwarded -1 http://www.sudo.ws/bugs/show_bug.cgi?id=647
Dear Maintainer, attached debdiff enables refreshed patches to fix visudo on Hurd, see #655883 and #655948. It seems they have never been actually applied. Thanks for considering, -- G..e
diff -Nru sudo-1.8.9p5/debian/changelog sudo-1.8.9p5/debian/changelog --- sudo-1.8.9p5/debian/changelog 2014-02-04 18:46:35.000000000 +0000 +++ sudo-1.8.9p5/debian/changelog 2014-05-09 11:22:13.000000000 +0000 @@ -1,3 +1,9 @@ +sudo (1.8.9p5-1.1) UNRELEASED; urgency=medium + + * Refresh and enable patches to fix visudo on Hurd. + + -- Gabriele Giacone <gg0-gu...@exodar.sceen.net> Fri, 09 May 2014 00:42:59 +0000 + sudo (1.8.9p5-1) unstable; urgency=low * new upstream release, closes: #735328 diff -Nru sudo-1.8.9p5/debian/patches/series sudo-1.8.9p5/debian/patches/series --- sudo-1.8.9p5/debian/patches/series 2014-02-04 18:46:35.000000000 +0000 +++ sudo-1.8.9p5/debian/patches/series 2014-05-09 10:39:25.000000000 +0000 @@ -1,2 +1,4 @@ typo-in-classic-insults.diff paths-in-samples.diff +use-flock-on-hurd.diff +skip-noedit.diff diff -Nru sudo-1.8.9p5/debian/patches/skip-noedit.diff sudo-1.8.9p5/debian/patches/skip-noedit.diff --- sudo-1.8.9p5/debian/patches/skip-noedit.diff 2014-02-04 18:46:35.000000000 +0000 +++ sudo-1.8.9p5/debian/patches/skip-noedit.diff 2014-05-09 10:34:26.000000000 +0000 @@ -1,12 +1,16 @@ -Skip installing/unlinking files without doedit set +Description: Skip installing/unlinking files without doedit set +Author: Steven McDonald <ste...@steven-mcdonald.id.au> +Bug-Debian: https://bugs.debian.org/655948 + --- a/plugins/sudoers/visudo.c +++ b/plugins/sudoers/visudo.c -@@ -247,6 +247,8 @@ +@@ -566,6 +566,9 @@ install_sudoers(struct sudoersfile *sp, + bool rval = false; + debug_decl(install_sudoers, SUDO_DEBUG_UTIL) - /* Install the sudoers temp files. */ - tq_foreach_fwd(&sudoerslist, sp) { -+ if (!sp->doedit) -+ continue; - if (!sp->modified) - (void) unlink(sp->tpath); - else ++ if (!sp->doedit) { ++ goto done; ++ } + if (!sp->modified) { + /* + * No changes but fix owner/mode if needed. diff -Nru sudo-1.8.9p5/debian/patches/use-flock-on-hurd.diff sudo-1.8.9p5/debian/patches/use-flock-on-hurd.diff --- sudo-1.8.9p5/debian/patches/use-flock-on-hurd.diff 2014-02-04 18:46:35.000000000 +0000 +++ sudo-1.8.9p5/debian/patches/use-flock-on-hurd.diff 2014-05-09 10:37:14.000000000 +0000 @@ -1,9 +1,10 @@ -Use flock instead of lockf for visudo on hurd -Index: sudo-1.8.3p1/configure.in -=================================================================== ---- sudo-1.8.3p1.orig/configure.in 2011-10-25 14:11:40.000000000 +0000 -+++ sudo-1.8.3p1/configure.in 2012-01-08 04:05:23.000000000 +0000 -@@ -1864,6 +1864,9 @@ +Description: Use flock instead of lockf for visudo on hurd +Author: Justus Winter <4win...@informatik.uni-hamburg.de> +Bug-Debian: https://bugs.debian.org/655883 + +--- a/configure.ac ++++ b/configure.ac +@@ -2002,6 +2002,9 @@ case "$host" in ;; *-gnu*) OSDEFS="${OSDEFS} -D_GNU_SOURCE"
