move to source version 3.0 (quilt)

diff --git a/debian/changelog b/debian/changelog
index e1281ba329d5c26e8e8d5d5ca231d09ce3eb1f07..cf9c915f8fa3542186aaef0423af39a7d634053a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 sudo (1.7.2p1-2) UNRELEASED; urgency=low
 
-  * working on substitution variables in man pages
+  * move to source format 3.0 (quilt) and restructure changes as patches
+  * fix unprocessed substitution variables in man pages, closes: #557204
+  * apply patch from Neil Moore to fix Debian-specific content in the
+    visudo man page, closes: #555013
 
  -- Bdale Garbee <bdale@gag.com>  Fri, 20 Nov 2009 07:31:30 -0700
 

diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644 (file)
index 0000000..2a9aa23
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+sudo-1.7.2p1-visudo-manpage-fix.diff

diff --git a/debian/patches/sudo-1.7.2p1-visudo-manpage-fix.diff b/debian/patches/sudo-1.7.2p1-visudo-manpage-fix.diff
new file mode 100644 (file)
index 0000000..b8bcb45
--- /dev/null
+++ b/debian/patches/sudo-1.7.2p1-visudo-manpage-fix.diff
@@ -0,0 +1,24 @@
+--- sudo-1.7.2p1/visudo.pod    2008-11-15 13:34:01.000000000 -0500
++++ sudo-1.7.2p1-manpage/visudo.pod    2009-11-07 18:54:00.841321731 -0500
+@@ -39,15 +39,18 @@
+ 
+ There is a hard-coded list of editors that B<visudo> will use set
+ at compile-time that may be overridden via the I<editor> I<sudoers>
+-C<Default> variable.  This list defaults to the path to L<vi(1)> on
+-your system, as determined by the I<configure> script.  Normally,
++C<Default> variable.  On Debian systems, this list defaults to
++/usr/bin/editor, which is meant to be a system-wide default editor
++chosen through the alternatives system.  Normally,
+ B<visudo> does not honor the C<VISUAL> or C<EDITOR> environment
+ variables unless they contain an editor in the aforementioned editors
+-list.  However, if B<visudo> is configured with the I<--with-enveditor>
++list.  However, if B<visudo> is configured with the I<--with-env-editor>
+ option or the I<env_editor> C<Default> variable is set in I<sudoers>,
+ B<visudo> will use any the editor defines by C<VISUAL> or C<EDITOR>.
+ Note that this can be a security hole since it allows the user to
+ execute any program they wish simply by setting C<VISUAL> or C<EDITOR>.
++Despite this potential risk, sudo on Debian is compiled with the
++I<--with-env-editor> flag.
+ 
+ B<visudo> parses the I<sudoers> file after the edit and will
+ not save the changes if there is a syntax error.  Upon finding

diff --git a/debian/source/format b/debian/source/format
new file mode 100644 (file)
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

diff --git a/visudo.man.in b/visudo.man.in
index dbdddc741b2052ae4d05cf8a39067c6b5318f6a2..2f7becbb0897c864e0f87e3f4c2b99ac1e913986 100644 (file)
--- a/visudo.man.in
+++ b/visudo.man.in
@@ -173,19 +173,15 @@ edited you will receive a message to try again later.
 .PP
 There is a hard-coded list of editors that \fBvisudo\fR will use set
 at compile-time that may be overridden via the \fIeditor\fR \fIsudoers\fR
-\&\f(CW\*(C`Default\*(C'\fR variable.  
-On Debian systems, this list defaults to /usr/bin/editor, which is meant to
-be a system-wide default editor chosen through the alternatives system.
-Normally, \&\fBvisudo\fR does not honor the \f(CW\*(C`VISUAL\*(C'\fR or 
-\f(CW\*(C`EDITOR\*(C'\fR environment
+\&\f(CW\*(C`Default\*(C'\fR variable.  This list defaults to the path to \fIvi\fR\|(1) on
+your system, as determined by the \fIconfigure\fR script.  Normally,
+\&\fBvisudo\fR does not honor the \f(CW\*(C`VISUAL\*(C'\fR or \f(CW\*(C`EDITOR\*(C'\fR environment
 variables unless they contain an editor in the aforementioned editors
 list.  However, if \fBvisudo\fR is configured with the \fI\-\-with\-enveditor\fR
 option or the \fIenv_editor\fR \f(CW\*(C`Default\*(C'\fR variable is set in \fIsudoers\fR,
 \&\fBvisudo\fR will use any the editor defines by \f(CW\*(C`VISUAL\*(C'\fR or \f(CW\*(C`EDITOR\*(C'\fR.
 Note that this can be a security hole since it allows the user to
 execute any program they wish simply by setting \f(CW\*(C`VISUAL\*(C'\fR or \f(CW\*(C`EDITOR\*(C'\fR.
-Despite this potential risk, sudo on Debian is compiled with the
-\fI\-\-with\-enveditor\fR flag.
 .PP
 \&\fBvisudo\fR parses the \fIsudoers\fR file after the edit and will
 not save the changes if there is a syntax error.  Upon finding