update docs and configure options

diff --git a/debian/OPTIONS b/debian/OPTIONS
index 35710ba4447e8193036eb2dfce2365599ca8bbdb..49938d78a73174ee510b679346213b471752e495 100644 (file)
--- a/debian/OPTIONS
+++ b/debian/OPTIONS
@@ -1,5 +1,10 @@
 The following options were used to configure sudo for Debian GNU/Linux.
 
+  --with-all-insults
+
+       Include all the insults in the binary, won't be enabled unless turned
+       on in the sudoers file.
+
   --with-devel
 
        Force flex and bison runs on each build.
@@ -8,18 +13,10 @@ The following options were used to configure sudo for Debian GNU/Linux.
        
        Support for pluggable authentication modules.
 
-  --with-ldap
-
-       Support for LDAP authentication, in the sudo-ldap package version only.
-
   --with-fqdn 
 
        Allow use of fully qualified domain names in the sudoers file.
 
-  --disable-root-mailer
-
-       Send mail as the invoking user, not as root.
-
   --with-logging=syslog
   --with-logfac=authpriv 
 
@@ -33,27 +30,30 @@ The following options were used to configure sudo for Debian GNU/Linux.
 
   --with-timeout=15 
   --with-password-timeout=0 
+  --with-passprompt="[sudo] password for %p: "
 
        Allow 15 minutes before a user has to re-type their passord, versus
        the sudo usual default of 5.  Never time out while waiting for a
-       password to be typed, this is a seriously big deal for Debian package
-       developers using 'dpkg-buildpackage -rsudo'.
+       password to be typed, this is important to Debian package developers 
+       using 'dpkg-buildpackage -rsudo'.  Make it clear which password is 
+       requested.
 
-  --with-secure-path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:\
-       /sbin:/bin:/usr/X11R6/bin"  
-
-       Give a reasonable default path for commands run as root via sudo.
-
-  --with-all-insults
+  --disable-root-mailer
 
-       Include all the insults in the binary, won't be enabled unless turned
-       on in the sudoers file.
+       Send mail as the invoking user, not as root.
 
   --with-sendmail=/usr/sbin/sendmail
 
        Use Debian policy to know the location of sendmail instead of trying 
        to detect it at build time.
 
-  --disable-setresuid
+  --with-timedir=/var/lib/sudo
+  --mandir=/usr/share/man
+  --libexecdir=/usr/lib/sudo
+
+       Comply with Debian policy on suitable paths.
+
+  --with-ldap
+
+       Support for LDAP authentication, in the sudo-ldap package version only.
 
-       Linux 2.2 kernels don't support setresgid.

diff --git a/debian/changelog b/debian/changelog
index feb805449ac749cb94b04a873a55fcfb0d3f170f..40811787337a7bb96d6424bc94427d71e55b6fe1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ sudo (1.8.1p2-1) UNRELEASED; urgency=low
   * include common-session in pam config, closes: #519700, #607199
   * move secure_path from configure to default sudoers, closes: #85123, 85917
   * improve sudoers self-documentation, closes: #613639
+  * drop --disable-setresuid since modern systems should not run 2.2 kernels
 
  -- Bdale Garbee <bdale@gag.com>  Fri, 22 Jul 2011 15:22:40 +0200
 

diff --git a/debian/rules b/debian/rules
index 2dc5e8159452033e2cc68b3b8c4d8c8190e7cd48..9a0ad285e85ec66e61d0e52be161bf71478520f5 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -31,10 +31,9 @@ configure-stamp:
                --with-timeout=15 \
                --with-password-timeout=0 \
                --with-passprompt="[sudo] password for %p: " \
-               --with-timedir=/var/lib/sudo \
                --disable-root-mailer \
-               --disable-setresuid \
                --with-sendmail=/usr/sbin/sendmail \
+               --with-timedir=/var/lib/sudo \
                --mandir=/usr/share/man \
                --libexecdir=/usr/lib/sudo
 

diff --git a/debian/sudo-ldap.docs b/debian/sudo-ldap.docs
index 76cded00cd89f5ee6df139a711de224be9108b82..565ca2df497fa7c5a907a618903fda767c55bc1b 100644 (file)
--- a/debian/sudo-ldap.docs
+++ b/debian/sudo-ldap.docs
@@ -1,8 +1,8 @@
 debian/OPTIONS 
-UPGRADE 
-HISTORY 
+doc/UPGRADE 
+doc/HISTORY 
+doc/TROUBLESHOOTING
+doc/schema.*
+plugins/sudoers/sudoers2ldif
 README 
 README.LDAP 
-TROUBLESHOOTING
-sudoers2ldif
-schema.*

diff --git a/debian/sudo.docs b/debian/sudo.docs
index e3c9b7b82111723d1dab3b7761715f7e085742be..b590209412dec8b8428100b58d0b70d8f913eb5d 100644 (file)
--- a/debian/sudo.docs
+++ b/debian/sudo.docs
@@ -1,5 +1,5 @@
 debian/OPTIONS 
-UPGRADE 
-HISTORY 
+doc/UPGRADE 
+doc/HISTORY 
+doc/TROUBLESHOOTING
 README 
-TROUBLESHOOTING