From 332f652863be6fc798cb75dedff288051461ea24 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Wed, 5 Sep 2007 11:26:58 +0100 Subject: [PATCH] Imported Debian patch 1.6.8p12-6 --- Makefile.in | 2 -- config.guess | 34 +++++++++++++++++++++++++--------- config.sub | 24 +++++++++++++++++------- debian/changelog | 10 ++++++++++ debian/init.d | 2 +- debian/sudo-ldap.init.d | 2 +- sudoers.pod | 6 +++--- visudo.pod | 4 ++-- 8 files changed, 59 insertions(+), 25 deletions(-) diff --git a/Makefile.in b/Makefile.in index 0474932..8319b7f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -385,8 +385,6 @@ bindist: fi ; \ cp $(srcdir)/INSTALL.binary $$tdir/INSTALL ; \ sh ./config.status --file=Makefile.binary && cp Makefile.binary $$tdir/Makefile ; \ - strip sudo ; \ - strip visudo ; \ cd tmp.$$ARCH && tar Ocf ../sudo-$(VERSION)-$$ARCH.tar sudo-$(VERSION) && cd .. ; \ gzip --best sudo-$(VERSION)-$$ARCH.tar ; \ rm -rf tmp.$$ARCH ; \ diff --git a/config.guess b/config.guess index 396482d..278f9e9 100644 --- a/config.guess +++ b/config.guess @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, # Inc. -timestamp='2006-07-02' +timestamp='2007-07-22' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -161,6 +161,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched @@ -329,7 +330,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; - i86pc:SunOS:5.*:*) + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:6*:*) @@ -780,7 +781,7 @@ EOF i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; - i*:MINGW*:*) + *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; i*:windows32*:*) @@ -790,12 +791,15 @@ EOF i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - x86:Interix*:[3456]*) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; - EM64T:Interix*:[3456]*) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; + *:Interix*:[3456]*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T | authenticamd) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; @@ -950,6 +954,9 @@ EOF x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu exit ;; + xtensa:Linux:*:*) + echo xtensa-unknown-linux-gnu + exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent @@ -1208,6 +1215,15 @@ EOF SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} exit ;; + SX-7:SUPER-UX:*:*) + echo sx7-nec-superux${UNAME_RELEASE} + exit ;; + SX-8:SUPER-UX:*:*) + echo sx8-nec-superux${UNAME_RELEASE} + exit ;; + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit ;; diff --git a/config.sub b/config.sub index fab0aa3..1761d8b 100755 --- a/config.sub +++ b/config.sub @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, # Inc. -timestamp='2006-09-20' +timestamp='2007-06-28' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -245,12 +245,12 @@ case $basic_machine in | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ - | fr30 | frv \ + | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore \ + | maxq | mb | microblaze | mcore | mep \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -324,7 +324,7 @@ case $basic_machine in | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ - | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ @@ -475,8 +475,8 @@ case $basic_machine in basic_machine=craynv-cray os=-unicosmp ;; - cr16c) - basic_machine=cr16c-unknown + cr16) + basic_machine=cr16-unknown os=-elf ;; crds | unos) @@ -683,6 +683,10 @@ case $basic_machine in basic_machine=i386-pc os=-mingw32 ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; miniframe) basic_machine=m68000-convergent ;; @@ -925,6 +929,9 @@ case $basic_machine in basic_machine=sh-hitachi os=-hms ;; + sh5el) + basic_machine=sh5le-unknown + ;; sh64) basic_machine=sh64-unknown ;; @@ -1219,7 +1226,7 @@ case $os in | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1414,6 +1421,9 @@ case $basic_machine in m68*-cisco) os=-aout ;; + mep-*) + os=-elf + ;; mips*-cisco) os=-elf ;; diff --git a/debian/changelog b/debian/changelog index d7d10b9..3982c4d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +sudo (1.6.8p12-6) unstable; urgency=low + + * fix typos in visudo.pod relating to env_editor variable, closes: #418886 + * have init.d touch directories in /var/run/sudo, not just files, as a + followup to #330868. + * fix various typos in sudoers.pod, closes: #419749 + * don't let Makefile strip binaries, closes: #438073 + + -- Bdale Garbee Wed, 05 Sep 2007 11:26:58 +0100 + sudo (1.6.8p12-5) unstable; urgency=low * update debian/copyright to reflect new upstream URL, closes: #368746 diff --git a/debian/init.d b/debian/init.d index f56121a..3a376ff 100644 --- a/debian/init.d +++ b/debian/init.d @@ -17,7 +17,7 @@ case "$1" in # make sure privileges don't persist across reboots if [ -d /var/run/sudo ] then - find /var/run/sudo -type f -exec touch -t 198501010000 '{}' \; + find /var/run/sudo -exec touch -t 198501010000 '{}' \; fi ;; stop|reload|restart|force-reload) diff --git a/debian/sudo-ldap.init.d b/debian/sudo-ldap.init.d index 3decdf2..f1656c3 100644 --- a/debian/sudo-ldap.init.d +++ b/debian/sudo-ldap.init.d @@ -17,7 +17,7 @@ case "$1" in # make sure privileges don't persist across reboots if [ -d /var/run/sudo ] then - find /var/run/sudo -type f -exec touch -t 198501010000 '{}' \; + find /var/run/sudo -exec touch -t 198501010000 '{}' \; fi ;; stop|reload|restart|force-reload) diff --git a/sudoers.pod b/sudoers.pod index 726f405..d789bd5 100644 --- a/sudoers.pod +++ b/sudoers.pod @@ -381,7 +381,7 @@ password. This flag is I<@insults@> by default. If set, B will only run when the user is logged in to a real tty. This will disallow things like C<"rsh somehost sudo ls"> since L does not allocate a tty. Because it is not possible to turn -off echo when there is no tty present, some sites may with to set +off echo when there is no tty present, some sites may wish to set this flag to prevent a user from entering a visible password. This flag is I by default. @@ -880,7 +880,7 @@ This behavior may be overridden via the verifypw and listpw options. =head3 NOEXEC and EXEC If sudo has been compiled with I support and the underlying -operating system support it, the C tag can be used to prevent +operating system supports it, the C tag can be used to prevent a dynamically-linked executable from running further commands itself. In the following example, user B may run F @@ -1014,7 +1014,7 @@ important. In general, you should structure I such that the C, C, and C specifications come first, followed by any C lines, and finally the C and user specifications. The basic rule of thumb -is you cannot reference an Alias that has not already been defined. +is that you cannot reference an Alias that has not already been defined. Below are example I entries. Admittedly, some of these are a bit contrived. First, we allow a few environment diff --git a/visudo.pod b/visudo.pod index 735ce8f..655853c 100644 --- a/visudo.pod +++ b/visudo.pod @@ -43,8 +43,8 @@ C variable. This list defaults to the path to L on your system, as determined by the I script. Normally, B does not honor the C or C environment variables unless they contain an editor in the aforementioned editors -list. However, if B is configured with the I<--with-enveditor> -flag or the I C variable is set in I, +list. However, if B is configured with the I<--with-env-editor> +flag or the I C variable is set in I, B will use any the editor defines by C or C. Note that this can be a security hole since it allows the user to execute any program they wish simply by setting C or C. -- 2.47.2