Fixes submitted by James

THANKS

@@ -125,6 +125,7 @@ Oliver Haakert		   haakert@hsp.de
 Oskari Jääskeläinen	   f33003a@cc.hut.fi
 Paul D. Smith		   psmith@baynetworks.com
 Per Cederqvist             ceder@lysator.liu.se
+Phil Blundell              pb@debian.org
 Philippe Laliberte	   arsphl@oeil.qc.ca
 Peter Fales                psfales@lucent.com
 Peter Gutmann		   pgut001@cs.auckland.ac.nz

debian/README.Debian

@@ -4,15 +4,15 @@ GDBM keyring support
 GDBM-based keyring support is (and always) was an experimental feature
 which is likely to be removed in future versions.  For that reason it
 is not compiled into the Debian package and won't be until and unless
-GDBM support stabalizes.
+GDBM support stabilises.
 
 Upgrading from old (<= 0.3.3) versions GnuPG
 --------------------------------------------
 
 Due to a bug in the way secret keys were encrypted in versions prior
-to 0.3.3, later version of gnupg are not backwards compatible and you
+to 0.3.3, later version of GnuPG are not backwards compatible and you
 will have to convert your secret keys before using old secret keys
-with recent versions of gnupg.
+with recent versions of GnuPG.
 
 The upgrade strategy is described in /usr/doc/gnupg/NEWS.gz, please
 refer to it for more details, but it requires an old copy of the gpg
@@ -20,7 +20,7 @@ and gpgm binaries.  They may be on your system as gpg.old and
 gpgm.old, but if they're not you can find gnupg 0.3.2 source and
 binaries for i386, m68k, alpha, powerpc and hurd-i386 at:
 
-  <URL:http://james.nocrew.org/gnupg/>
+  <URL:http://people.debian.org/~troup/gnupg/>
 
 -- 
 James Troup <james@nocrew.org>, Horsforth, UK

debian/changelog

@@ -1,3 +1,30 @@
+gnupg (1.0.5-1) unstable; urgency=low
+
+  * New upstream version.
+  * debian/README.Debian: fix spelling and update URL.
+  * debian/rules (binary): remove the new info files.
+  * scripts/config.{guess,sub}: sync with subversions, closes: #95729.
+
+ -- James Troup <james@nocrew.org>  Mon, 30 Apr 2001 02:12:38 +0100
+
+gnupg (1.0.4-4) unstable; urgency=low
+
+  * po/ru.po: patch by Ilya Martynov <m_ilya@agava.com> to replace German
+    entries and add missing translations, closes: #93987.
+  * g10/revoke.c (ask_revocation_reason): typo fix (s/non longer/no
+    longer/g); noticed by Colin Watson <cjw44@flatline.org.uk>, closes:
+    #93664.
+
+  * Deprecated depreciated; noticed by Vincent Broman
+    <broman@spawar.navy.mil>.
+
+  * Following two patches are from Vincent Broman.
+  * g10/mainproc.c (proc_tree): use iobuf_get_real_fname() in preference
+    to iobuf_get_fname().
+  * g10/openfile.c (open_sigfile): handle .sign prefixed files correctly.
+
+ -- James Troup <james@nocrew.org>  Fri, 20 Apr 2001 23:32:44 +0100
+
 gnupg (1.0.4-3) unstable; urgency=medium
 
   * debian/rules (binary): make gpg binary suid, closes: #86433.

debian/copyright

@@ -3,14 +3,14 @@ replacement.
 
 This package was put together by me, James Troup <james@nocrew.org>,
 from the sources, which I obtained from
-ftp://ftp.gnupg.org/pub/gcrypt/gnupg/gnupg-1.0.3.tar.gz.  The changes
+ftp://ftp.gnupg.org/pub/gcrypt/gnupg/gnupg-1.0.5.tar.gz.  The changes
 were minimal, namely:
 
 - adding support for the Debian package maintenance scheme, by adding
   various debian/* files.
 
-Program Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+Program Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
-Modifications for Debian Copyright (C) 1998, 1999, 2000 James Troup.
+Modifications for Debian Copyright (C) 1998, 1999, 2000, 2001 James Troup.
 
 GnuPG is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

debian/rules

@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-# debian/rules file - for GNUPG (1.0.3)
+# debian/rules file - for GNUPG (1.0.5)
 # Based on sample debian/rules file - for GNU Hello (1.3).
 # Copyright 1994,1995 by Ian Jackson.
 # Copyright 1998 James Troup
@@ -34,8 +34,10 @@ binary-arch:	checkroot build # test
 	$(checkdir)
 	-rm -rf debian/tmp
 	install -d debian/tmp/DEBIAN/
-	install -m 755 debian/preinst debian/prerm debian/postinst debian/postrm debian/tmp/DEBIAN/
+	install -m 755 debian/preinst debian/prerm debian/postinst debian/tmp/DEBIAN/
 	$(MAKE) prefix=`pwd`/debian/tmp/usr mandir=`pwd`/debian/tmp/usr/share/man install
+	# copies of the manpage which can't be grokked by install-info
+	rm debian/tmp/usr/info/*
 	$(STRIP) debian/tmp/usr/bin/*
 	chmod 4755 debian/tmp/usr/bin/gpg
 	chmod 644 debian/tmp/usr/lib/gnupg/*

g10/ChangeLog

@@ -1,3 +1,7 @@
+2001-05-06  Werner Koch  <wk@gnupg.org>
+
+	* revoke.c: Small typo fix
+
 2001-05-04  Werner Koch  <wk@gnupg.org>
 
 	* passphrase.c (passphrase_clear_cache): Shortcut if agent usage

g10/revoke.c

@@ -243,7 +243,7 @@ ask_revocation_reason( int key_rev, int cert_rev, int hint )
     const char *text_1 = _("Key has been compromised");
     const char *text_2 = _("Key is superseded");
     const char *text_3 = _("Key is no longer used");
-    const char *text_4 = _("User ID is non longer valid");
+    const char *text_4 = _("User ID is no longer valid");
     const char *code_text = NULL;
 
     do {
@@ -293,7 +293,7 @@ ask_revocation_reason( int key_rev, int cert_rev, int hint )
 		code_text = text_3;
 	    }
 	    else if( cert_rev && n == 4 ) {
-		code = 0x20; /* uid is non longer valid */
+		code = 0x20; /* uid is no longer valid */
 		code_text = text_4;
 	    }
 	    else

mpi/ChangeLog

@@ -1,3 +1,7 @@
+2001-05-06  Werner Koch  <wk@gnupg.org>
+
+	* longlong.h: Fixes for ARM by Phil Blundell.
+
 2001-04-17  Werner Koch  <wk@gnupg.org>
 
 	Updated copyright notices.

mpi/longlong.h

@@ -200,28 +200,27 @@ extern UDItype __udiv_qrnnd ();
 	     "rI" ((USItype)(bh)),                                      \
 	     "r" ((USItype)(al)),                                       \
 	     "rI" ((USItype)(bl)))
-#ifdef __ARM_ARCH_3__
+#if defined __ARM_ARCH_2__ || defined __ARM_ARCH_3__
-/* SAM This does not work on arm4 */
 #define umul_ppmm(xh, xl, a, b) \
   __asm__ ("%@ Inlined umul_ppmm
-	mov	%|r0, %2, lsr #16
+	mov	%|r0, %2, lsr #16		@ AAAA
-	mov	%|r2, %3, lsr #16
+	mov	%|r2, %3, lsr #16		@ BBBB
-	bic	%|r1, %2, %|r0, lsl #16
+	bic	%|r1, %2, %|r0, lsl #16		@ aaaa
-	bic	%|r2, %3, %|r2, lsl #16
+	bic	%0, %3, %|r2, lsl #16		@ bbbb
-	mul	%1, %|r1, %|r2
+	mul	%1, %|r1, %|r2			@ aaaa * BBBB
-	mul	%|r2, %|r0, %|r2
+	mul	%|r2, %|r0, %|r2		@ AAAA * BBBB
-	mul	%|r1, %0, %|r1
+	mul	%|r1, %0, %|r1			@ aaaa * bbbb
-	mul	%0, %|r0, %0
+	mul	%0, %|r0, %0			@ AAAA * bbbb
-	adds	%|r1, %|r2, %|r1
+	adds	%|r0, %1, %0			@ central sum
-	addcs	%0, %0, #65536
+	addcs	%|r2, %|r2, #65536
-	adds	%1, %1, %|r1, lsl #16
+	adds	%1, %|r1, %|r0, lsl #16
-	adc	%0, %0, %|r1, lsr #16"                                  \
+	adc	%0, %|r2, %|r0, lsr #16"                                \
 	   : "=&r" ((USItype)(xh)),                                     \
 	     "=r" ((USItype)(xl))                                       \
 	   : "r" ((USItype)(a)),                                        \
 	     "r" ((USItype)(b))                                         \
 	   : "r0", "r1", "r2")
-#elif __ARM_ARCH_4__
+#else
 #define umul_ppmm(xh, xl, a, b) \
   __asm__ ("%@ Inlined umul_ppmm
 	umull	%r1, %r0, %r2, %r3" \
@@ -230,8 +229,6 @@ extern UDItype __udiv_qrnnd ();
 		   : "r" ((USItype)(a)), \
 		     "r" ((USItype)(b)) \
 		   : "r0", "r1")
-#else
-#error Untested architecture
 #endif
 #define UMUL_TIME 20
 #define UDIV_TIME 100

scripts/ChangeLog

@@ -1,3 +1,7 @@
+2001-05-06  Werner Koch  <wk@gnupg.org>
+
+	* config.guess, config.sub: Add updates from subversions.gnu.org.
+
 2001-04-19  Werner Koch  <wk@gnupg.org>
 
 	* autogen.sh: Add VPATH build support for option --build-w32. 

scripts/config.guess

@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 #   Free Software Foundation, Inc.
 
-timestamp='2001-03-06'
+timestamp='2001-04-20'
 
 # 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
@@ -228,7 +228,8 @@ EOF
                 esac
         fi
         rm -f $dummy.s $dummy
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+        echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrs
+tuvwxyz'`
         exit 0 ;;
     Alpha\ *:Windows_NT*:*)
         # How do we know it's Interix rather than the generic POSIX subsystem?
@@ -412,6 +413,9 @@ EOF
         rm -f $dummy.c $dummy
         echo mips-mips-riscos${UNAME_RELEASE}
         exit 0 ;;
+    Motorola:PowerMAX_OS:*:*)
+        echo powerpc-motorola-powermax
+        exit 0 ;;
     Night_Hawk:Power_UNIX:*:*)
         echo powerpc-harris-powerunix
         exit 0 ;;
@@ -459,7 +463,7 @@ EOF
     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
         echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
         exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
-    i?86:AIX:*:*)
+    i*86:AIX:*:*)
         echo i386-ibm-aix
         exit 0 ;;
     ia64:AIX:*:*)
@@ -639,7 +643,7 @@ EOF
     hp8??:OSF1:*:*)
         echo hppa1.0-hp-osf
         exit 0 ;;
-    i?86:OSF1:*:*)
+    i*86:OSF1:*:*)
         if [ -x /usr/sbin/sysversion ] ; then
             echo ${UNAME_MACHINE}-unknown-osf1mk
         else
@@ -705,7 +709,7 @@ EOF
     hp300:OpenBSD:*:*)
         echo m68k-unknown-openbsd${UNAME_RELEASE}
         exit 0 ;;
-    i?86:BSD/386:*:* | i?86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
         echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
         exit 0 ;;
     sparc*:BSD/OS:*:*)
@@ -757,7 +761,7 @@ EOF
         echo ${UNAME_MACHINE}-unknown-linux
         exit 0 ;;
     m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnuaout
+        echo ${UNAME_MACHINE}-unknown-linux-gnu
         exit 0 ;;
     mips:Linux:*:*)
         cat >$dummy.c <<EOF
@@ -870,13 +874,13 @@ EOF
     sh*:Linux:*:*)
         echo ${UNAME_MACHINE}-unknown-linux-gnu
         exit 0 ;;
-    sparc:Linux:*:*)
+    sparc:Linux:*:* | sparc64:Linux:*:*)
         echo ${UNAME_MACHINE}-unknown-linux-gnu
         exit 0 ;;
     x86_64:Linux:*:*)
         echo x86_64-unknown-linux-gnu
         exit 0 ;;
-    i?86:Linux:*:*)
+    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
         # problems with other programs or directories called `ld' in the path.
@@ -887,14 +891,14 @@ EOF
                                     s/ .*//
                                     p'`
         case "$ld_supported_emulations" in
-	  i?86linux)
+          i*86linux)
                 echo "${UNAME_MACHINE}-pc-linux-gnuaout"
                 exit 0
                 ;;
-	  elf_i?86)
+          elf_i*86)
                 TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
                 ;;
-	  i?86coff)
+          i*86coff)
                 echo "${UNAME_MACHINE}-pc-linux-gnucoff"
                 exit 0
                 ;;
@@ -906,7 +910,7 @@ EOF
         # that means it is gnuoldld.
         test -z "$ld_supported_emulations" && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
         case "${UNAME_MACHINE}" in
-	i?86)
+        i*86)
           VENDOR=pc;
           ;;
         *)
@@ -944,10 +948,10 @@ EOF
         ;;
 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.  earlier versions
 # are messed up and put the nodename in both sysname and nodename.
-    i?86:DYNIX/ptx:4*:*)
+    i*86:DYNIX/ptx:4*:*)
         echo i386-sequent-sysv4
         exit 0 ;;
-    i?86:UNIX_SV:4.2MP:2.*)
+    i*86:UNIX_SV:4.2MP:2.*)
         # Unixware is an offshoot of SVR4, but it has its own version
         # number series starting with 2...
         # I am not positive that other SVR4 systems won't match this,
@@ -955,7 +959,7 @@ EOF
         # Use sysv4.2uw... so that sysv4* matches it.
         echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
         exit 0 ;;
-    i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
+    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
         UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
         if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
                 echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
@@ -963,7 +967,7 @@ EOF
                 echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
         fi
         exit 0 ;;
-    i?86:*:5:7*)
+    i*86:*:5:7*)
         # Fixed at (any) Pentium or better
         UNAME_MACHINE=i586
         if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then
@@ -972,7 +976,7 @@ EOF
             echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
         fi
         exit 0 ;;
-    i?86:*:3.2:*)
+    i*86:*:3.2:*)
         if test -f /usr/options/cb.name; then
                 UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
                 echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
@@ -990,7 +994,7 @@ EOF
                 echo ${UNAME_MACHINE}-pc-sysv32
         fi
         exit 0 ;;
-    i?86:*DOS:*:*)
+    i*86:*DOS:*:*)
         echo ${UNAME_MACHINE}-pc-msdosdjgpp
         exit 0 ;;
     pc:*:*:*)
@@ -1029,13 +1033,13 @@ EOF
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
           && echo i486-ncr-sysv4 && exit 0 ;;
-    m68*:LynxOS:2.*:*)
+    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
         echo m68k-unknown-lynxos${UNAME_RELEASE}
         exit 0 ;;
     mc68030:UNIX_System_V:4.*:*)
         echo m68k-atari-sysv4
         exit 0 ;;
-    i?86:LynxOS:2.*:* | i?86:LynxOS:3.[01]*:*)
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
         echo i386-unknown-lynxos${UNAME_RELEASE}
         exit 0 ;;
     TSUNAMI:LynxOS:2.*:*)
@@ -1044,7 +1048,7 @@ EOF
     rs6000:LynxOS:2.*:*)
         echo rs6000-unknown-lynxos${UNAME_RELEASE}
         exit 0 ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:*)
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
         echo powerpc-unknown-lynxos${UNAME_RELEASE}
         exit 0 ;;
     SM[BE]S:UNIX_SV:*:*)
@@ -1146,7 +1150,7 @@ EOF
         fi
         echo ${UNAME_MACHINE}-unknown-plan9
         exit 0 ;;
-    i?86:OS/2:*:*)
+    i*86:OS/2:*:*)
         # If we were able to find `uname', then EMX Unix compatibility
         # is probably installed.
         echo ${UNAME_MACHINE}-pc-os2-emx
@@ -1366,3 +1370,4 @@ exit 1
 # time-stamp-format: "%:y-%02m-%02d"
 # time-stamp-end: "'"
 # End:
+

scripts/config.sub

@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 #   Free Software Foundation, Inc.
 
-timestamp='2001-02-16'
+timestamp='2001-04-20'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -230,9 +230,11 @@ case $basic_machine in
                 | mips16 | mips64 | mipsel | mips64el \
                 | mips64orion | mips64orionel | mipstx39 | mipstx39el \
                 | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
-		| mips64vr5000 | miprs64vr5000el | mcore \
+                | mips64vr5000 | miprs64vr5000el | mcore | s390 | s390x \
-		| sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
+                | sparc | sparclet | sparclite | sparc64 | sparcv9 | sparcv9b \
-		| thumb | d10v | d30v | fr30 | avr | openrisc)
+                | v850 | c4x \
+                | thumb | d10v | d30v | fr30 | avr | openrisc | tic80 \
+                | pj | pjl | h8500)
                 basic_machine=$basic_machine-unknown
                 ;;
         m6811 | m68hc11 | m6812 | m68hc12)
@@ -240,13 +242,13 @@ case $basic_machine in
                 basic_machine=$basic_machine-unknown
                 os=-none
                 ;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl)
+        m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | w65)
                 ;;
 
         # We use `pc' rather than `unknown'
         # because (1) that's what they normally are, and
         # (2) the word "unknown" tends to confuse beginning users.
-	i[234567]86 | x86_64)
+        i*86 | x86_64)
           basic_machine=$basic_machine-pc
           ;;
         # Object if more than one company name word.
@@ -256,7 +258,7 @@ case $basic_machine in
                 ;;
         # Recognize the basic CPU types with company name.
         # FIXME: clean up the formatting here.
-	vax-* | tahoe-* | i[234567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
+        vax-* | tahoe-* | i*86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
               | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \
               | arm-*  | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \
               | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
@@ -270,15 +272,16 @@ case $basic_machine in
               | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
               | clipper-* | orion-* \
               | sparclite-* | pdp10-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
-	      | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
+              | sparc64-* | sparcv9-* | sparcv9b-* | sparc86x-* \
+              | mips16-* | mips64-* | mipsel-* \
               | mips64el-* | mips64orion-* | mips64orionel-* \
               | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
               | mipstx39-* | mipstx39el-* | mcore-* \
               | f30[01]-* | f700-* | s390-* | s390x-* | sv1-* | t3e-* \
               | [cjt]90-* \
               | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
-	      | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* \
+              | thumb-* | v850-* | d30v-* | tic30-* | tic80-* | c30-* | fr30-* \
-	      | bs2000-* | tic54x-* | c54x-* | x86_64-*)
+              | bs2000-* | tic54x-* | c54x-* | x86_64-* | pj-* | pjl-*)
                 ;;
         # Recognize the various machine names and aliases which stand
         # for a CPU type and a company and sometimes even an OS.
@@ -505,19 +508,19 @@ case $basic_machine in
                 basic_machine=i370-ibm
                 ;;
 # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i[34567]86v32)
+        i*86v32)
                 basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
                 os=-sysv32
                 ;;
-	i[34567]86v4*)
+        i*86v4*)
                 basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
                 os=-sysv4
                 ;;
-	i[34567]86v)
+        i*86v)
                 basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
                 os=-sysv
                 ;;
-	i[34567]86sol2)
+        i*86sol2)
                 basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
                 os=-solaris2
                 ;;
@@ -934,7 +937,7 @@ case $basic_machine in
         sh3 | sh4)
                 basic_machine=sh-unknown
                 ;;
-	sparc | sparcv9)
+        sparc | sparcv9 | sparcv9b)
                 basic_machine=sparc-sun
                 ;;
         cydra)
@@ -956,6 +959,9 @@ case $basic_machine in
                 basic_machine=c4x-none
                 os=-coff
                 ;;
+        *-unknown)
+                # Make sure to match an already-canonicalized machine name.
+                ;;
         *)
                 echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
                 exit 1
@@ -1021,7 +1027,7 @@ case $os in
                 ;;
         -qnx*)
                 case $basic_machine in
-		    x86-* | i[34567]86-*)
+                    x86-* | i*86-*)
                         ;;
                     *)
                         os=-nto$os
@@ -1354,3 +1360,4 @@ exit 0
 # time-stamp-format: "%:y-%02m-%02d"
 # time-stamp-end: "'"
 # End:
+