--- debathena-attach-10.0.1.orig/attach.1
+++ debathena-attach-10.0.1/attach.1
@@ -20,36 +20,35 @@
 .SH SYNOPSIS
 .TP 8
 attach
-[-v | -q] [-y | -n] [-g | -a] [-z | -h] [-x | -e] [-N | -S] 
-[-w | -r] [-p] [-L] [-O] [-o mountoptions] [-t type] [-m mountpoint] locker ...
+[-v | -q | -p] [-z | -h] locker ...
 .PP
 .nf
 attach -l \fIfilesystem\fP
-attach [-H \fIhost\fP]
 .fi
 .SH DESCRIPTION
 .I attach
 is a filesystem-independent utility which allows you attach a
-filesystem to a directory hierarchy on your workstation. The following
-filesystems are currently supported: AFS, NFS, and UFS.
+filesystem to a directory hierarchy on your workstation. Currently,
+the only supported filesystem type is AFS.
 
-Attach looks up \fIfilesystem\fP in
-.BR attach.conf (5)
-or by using
+.B NOTE: 
+.I attach 
+is provided mainly for compatibility with previous versions of Athena.
+With Debathena, \fI/mit\fP is auto-mounted, so you can access any path
+under \fI/mit\fP without explicitly attaching the locker.
+
+Attach looks up the \fIfilesystem\fP in
 .BR Hesiod (3)
 to retrieve the file system type, the server host, the name by which
 the file system is known to the server (e.g., an NFS server
 mountpoint), and the default mount point and mode (read-only,
-read-write). The user may also explicitly specify this information, as
-described below under the
-.I --explicit
-option.
+read-write). 
 
 By default,
 .I attach
 will attempt to make sure the user is authenticated to the remote
 filesystem, by getting tokens in the appropriate cell for an AFS
-locker, or creating a Kerberos NFS mapping for an NFS locker.
+locker.
 
 The following arguments to \fIattach\fP modify its behavior. Default
 options are marked as such. Unless otherwise marked, all arguments are
@@ -78,30 +77,6 @@
 This was used by the old "add" aliases. Use of this option
 automatically surpresses the -verbose option.
 .TP 8
-.I --lookup (-l)
-This option causes \fIattach\fP to look up the filesystem definition
-using either
-.BR attach.conf (5)
-or
-.BR Hesiod (3)
-and print out the definition, but not to actually attach the filesystem.
-.TP 8
-.I --map (-y)
-Attempt to authenticate the user with Kerberos to the filesystem
-server.  The authentication may be necessary in order to have the
-proper access to the filesystem.  This is the default.
-.TP 8
-.I --nomap (-n)
-Do not attempt to authenticate the user to the filesystem server.
-This implicitly invokes the -noremap option.
-.TP 8
-.I --remap (-g)
-Go ahead and reauthenticate the user even if the filesystem is already
-attached.  This is the default.
-.TP 8
-.I --noremap (-a)
-Don't reauthenticate the user if the filesystem is already attached.
-.TP 8
 .I --zephyr (-z)
 Subscribe to
 .BR Zephyr (1)
@@ -111,76 +86,6 @@
 Don't subscribe to
 .BR Zephyr (1)
 messages about the server host.
-.TP 8
-.I --readonly (-r), --write (-w)
-Overrides the default access mode for the next filesystem.  "-r"
-indicates read-only access, and "-w" indicates write access.  These
-options have no effect for AFS filesystems.
-.TP 8
-.I --mountpoint \fImount-point\fP (-m \fImount-point\fP)
-Overrides the default mount point for the next filesystem.
-.TP 8
-.I --master (-M)
-Attach the master copy of the locker even if a local copy of the
-locker exists.  Without this option, if a symlink exists in
-.B /var/athena/local-validated
-(or the value of local-dir in
-.BR attach.conf (5)
-if set) with the name of the locker, that symlink is copied to the
-mountpoint in place of attaching the locker.
-.TP 8
-.I --noexplicit (-x)
-Tell \fIattach\fP to interpret the \fIfilesystem\fP as a Hesiod name.
-This is the default.
-.TP 8
-.I --explicit (-e)
-Change the behavior of \fIattach\fP such that the \fIfilesystem\fP is
-now interpreted as an explicit description (\fIdirectory\fP in the
-case of AFS or \fIhost:directory\fP in the case of NFS) instead of as
-a Hesiod name. This allows arbitrary directories to be attached. When
-this option is used, the default mount point is determined by
-filesystem-specific code, but can be overridden by the -m option.
-.TP 8
-.I --type \fIfilesystem-type\fP (-t \fIfilesystem-type\fP)
-Used with the 
-.I --explicit
-option to tell \fIattach\fP the type of the filesystem that's going to
-be attached. It defaults to NFS.
-.TP 8
-.I --mountoptions \fIoptions\fP (-o \fIoptions\fP)
-Specify options for the mounting of the filesystem.  The options are
-the same as the ones used by
-.BR mount (8)\fP.
-.TP 8
-.I --nosetuid \fPor\fI -nosuid (-N)
-With this option, \fIattach\fP will mount the filesystem with the
-nosuid option.  This causes the kernel not to honor setuid or setgid
-permission in the filesystem.  (This option does not have any
-effect with AFS filesystems.)
-.TP 8
-.I --setuid -suid (-S)
-This option can be used by a trusted user to forcibly mount a
-filesystem without the nosuid option.  This can be used to override
-the fact that the system administrator has made an entry such that the
-filesystem would normally be mounted nosuid.
-.TP 8
-.I --override (-O)
-\fIAttach\fP can be set up so that normal users cannot attach certain
-filsystems.  A trusted user can use this option to override these
-restrictions.  See
-.BR attach.conf (5)
-for more information.
-.TP 8
-.I --lock (-L)
-This option tells \fIattach\fP to lock the filesystem so that it cannot
-be unmounted except explicitly by one of the trusted users.  This
-command requires the user to be in the trusted users list.
-.TP 8
-.I --host \fIhostnames\fP (-H \fIhostnames\fP)
-This option causes \fIattach\fP to list all filesystems that are mounted
-from the given \fIhostnames\fP.  After this option appears on the
-command line, no more filesystems may be attached; only hostnames may be
-specified.
 .PP
 If the default mount-point for a filesystem (or the mount-point
 specified with the -m option) does not exist, it is created.  Any
@@ -189,17 +94,9 @@
 detached, any directories that were created during the attach are
 deleted, if possible.
 
-.SH EXAMPLES
-.nf
-attach -t afs -m /mit/gnu -e /afs/.athena.mit.edu/project/gnu
-.fi
-
-Attach the read-write AFS path to the gnu locker to the mountpoint
-/mit/gnu.
-
 .SH DIAGNOSTICS
 If \fIattach\fP is unable to initalize the locker library, it will
-exist with status 1. If \fIattach\fP encounters a problem attaching a
+exit with status 1. If \fIattach\fP encounters a problem attaching a
 locker, it will continue trying to attach any remaining lockers on the
 command line, but eventually exit with status 2.
 
@@ -208,15 +105,22 @@
 .br
 /var/athena/attachtab/
 .br
-/var/athena/local-validated/
+
+.SH BUGS
+NFS and RVD lockers are no longer supported.
+
+.SH FEATURES
+NFS and RVD lockers are no longer supported.
 
 .SH "SEE ALSO"
-add(1), detach(1), nfsid(1), zinit(1), attach.conf(5)
+add(1), detach(1)
 
 .SH AUTHORS
-Dan Winship, MIT Information Systems
+SIPB Debathena Project
 .PP
-based on the original attach by
+Previous versions by:
+.br
+Dan Winship, MIT Information Systems
 .br
 Robert French, Project Athena
 .br
--- debathena-attach-10.0.1.orig/aclocal.m4
+++ debathena-attach-10.0.1/aclocal.m4
@@ -24,10 +24,6 @@
 dnl	ATHENA_REGEXP
 dnl		Sets REGEX_LIBS if rx library used; ensures POSIX
 dnl		regexp support.
-dnl	ATHENA_MOTIF
-dnl		Sets MOTIF_LIBS and defines HAVE_MOTIF if Motif used.
-dnl	ATHENA_MOTIF_REQUIRED
-dnl		Generates error if Motif not found.
 dnl	ATHENA_AFS
 dnl		Sets AFS_LIBS and defines HAVE_AFS if AFS used.  Pass
 dnl		in an argument giving the desired AFS libraries;
@@ -52,11 +48,6 @@
 dnl		used.
 dnl	ATHENA_HESIOD_REQUIRED
 dnl		Generates error if Hesiod not found.
-dnl	ATHENA_ARES
-dnl		Sets ARES_LIBS and defines HAVE_ARES if libares
-dnl		used.
-dnl	ATHENA_ARES_REQUIRED
-dnl		Generates error if libares not found.
 dnl	ATHENA_ZEPHYR
 dnl		Sets ZEPHYR_LIBS and defines HAVE_ZEPHYR if zephyr
 dnl		used.
@@ -123,36 +114,6 @@
 fi
 AC_SUBST(REGEX_LIBS)])
 
-dnl ----- Motif -----
-
-AC_DEFUN([ATHENA_MOTIF_CHECK],
-[if test "$motif" != yes; then
-	CPPFLAGS="$CPPFLAGS -I$motif/include"
-	LDFLAGS="$LDFLAGS -L$motif/lib"
-fi
-AC_SEARCH_LIBS(XmStringFree, Xm, :, [AC_MSG_ERROR(Motif library not found)])])
-
-AC_DEFUN([ATHENA_MOTIF],
-[AC_ARG_WITH(motif,
-	[  --with-motif=PREFIX     Use Motif],
-	[motif="$withval"], [motif=no])
-if test "$motif" != no; then
-	ATHENA_MOTIF_CHECK
-	MOTIF_LIBS=-lXm
-	AC_DEFINE(HAVE_MOTIF)
-fi
-AC_SUBST(MOTIF_LIBS)])
-
-AC_DEFUN([ATHENA_MOTIF_REQUIRED],
-[AC_ARG_WITH(motif,
-	[  --with-motif=PREFIX     Specify location of Motif],
-	[motif="$withval"], [motif=yes])
-if test "$motif" != no; then
-	ATHENA_MOTIF_CHECK
-else
-	AC_MSG_ERROR(This package requires Motif.)
-fi])
-
 dnl ----- AFS -----
 
 AC_DEFUN([ATHENA_AFS_CHECK],
@@ -317,36 +278,6 @@
 	AC_MSG_ERROR(This package requires Hesiod.)
 fi])
 
-dnl ----- libares -----
-
-AC_DEFUN([ATHENA_ARES_CHECK],
-[AC_SEARCH_LIBS(res_send, resolv)
-if test "$ares" != yes; then
-	CPPFLAGS="$CPPFLAGS -I$ares/include"
-	LDFLAGS="$LDFLAGS -L$ares/lib"
-fi
-AC_SEARCH_LIBS(ares_init, ares, :, [AC_MSG_ERROR(libares not found)])])
-
-AC_DEFUN([ATHENA_ARES],
-[AC_ARG_WITH(ares,
-	[  --with-ares=PREFIX      Use libares],
-	[ares="$withval"], [ares=no])
-if test "$ares" != no; then
-	ATHENA_ARES_CHECK
-	ARES_LIBS="-lares"
-	AC_DEFINE(HAVE_ARES)
-fi
-AC_SUBST(ARES_LIBS)])
-
-AC_DEFUN([ATHENA_ARES_REQUIRED],
-[AC_ARG_WITH(ares,
-	[  --with-ares=PREFIX      Specify location of libares],
-	[ares="$withval"], [ares=yes])
-if test "$ares" != no; then
-	ATHENA_ARES_CHECK
-else
-	AC_MSG_ERROR(This package requires libares.)
-fi])
 dnl ----- zephyr -----
 
 AC_DEFUN([ATHENA_ZEPHYR_CHECK],
--- debathena-attach-10.0.1.orig/config.guess
+++ debathena-attach-10.0.1/config.guess
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 #   Free Software Foundation, Inc.
 
-timestamp='2008-01-23'
+timestamp='2009-06-10'
 
 # 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
@@ -170,7 +170,7 @@
 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
+			| grep -q __ELF__
 		then
 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
 		    # Return netbsd for either.  FIX?
@@ -324,6 +324,9 @@
 	case `/usr/bin/uname -p` in
 	    sparc) echo sparc-icl-nx7; exit ;;
 	esac ;;
+    s390x:SunOS:*:*)
+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
     sun4H:SunOS:5.*:*)
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
@@ -331,7 +334,20 @@
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	eval $set_cc_for_build
+	SUN_ARCH="i386"
+	# If there is a compiler, see if it is configured for 64-bit objects.
+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+	# This test works for both compilers.
+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_64BIT_ARCH >/dev/null
+	    then
+		SUN_ARCH="x86_64"
+	    fi
+	fi
+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
     sun4*:SunOS:6*:*)
 	# According to config.sub, this is the proper way to canonicalize
@@ -640,7 +656,7 @@
 	    # => hppa64-hp-hpux11.23
 
 	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep __LP64__ >/dev/null
+		grep -q __LP64__
 	    then
 		HP_ARCH="hppa2.0w"
 	    else
@@ -796,7 +812,7 @@
 	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
-	    EM64T | authenticamd)
+	    EM64T | authenticamd | genuineintel)
 		echo x86_64-unknown-interix${UNAME_RELEASE}
 		exit ;;
 	    IA64)
@@ -806,6 +822,9 @@
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
 	exit ;;
+    8664:Windows_NT:*)
+	echo x86_64-pc-mks
+	exit ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
@@ -866,40 +885,17 @@
     m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
-    mips:Linux:*:*)
+    mips:Linux:*:* | mips64:Linux:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
 	#undef CPU
-	#undef mips
-	#undef mipsel
+	#undef ${UNAME_MACHINE}
+	#undef ${UNAME_MACHINE}el
 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mipsel
+	CPU=${UNAME_MACHINE}el
 	#else
 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
-    mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips64
-	#undef mips64el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mips64el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips64
+	CPU=${UNAME_MACHINE}
 	#else
 	CPU=
 	#endif
@@ -931,10 +927,13 @@
 	  EV67)  UNAME_MACHINE=alphaev67 ;;
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
         esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+	objdump --private-headers /bin/sh | grep -q ld.so.1
 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
 	exit ;;
+    padre:Linux:*:*)
+	echo sparc-unknown-linux-gnu
+	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -982,17 +981,6 @@
 	  elf32-i386)
 		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
 		;;
-	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit ;;
-	  coff-i386)
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit ;;
-	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit ;;
 	esac
 	# Determine whether the default compiler is a.out or elf
 	eval $set_cc_for_build
@@ -1058,7 +1046,7 @@
     i*86:syllable:*:*)
 	echo ${UNAME_MACHINE}-pc-syllable
 	exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
     i*86:*DOS:*:*)
@@ -1102,8 +1090,11 @@
     pc:*:*:*)
 	# Left here for compatibility:
         # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i386.
-	echo i386-pc-msdosdjgpp
+        # the processor, so we play safe by assuming i586.
+	# Note: whatever this is, it MUST be the same as what config.sub
+	# prints for the "djgpp" host, or else GDB configury will decide that
+	# this is a cross-build.
+	echo i586-pc-msdosdjgpp
         exit ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
@@ -1141,6 +1132,16 @@
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
           && { echo i486-ncr-sysv4; exit; } ;;
+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+	OS_REL='.3'
+	test -r /etc/.relid \
+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
 	echo m68k-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
@@ -1153,7 +1154,7 @@
     rs6000:LynxOS:2.*:*)
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
     SM[BE]S:UNIX_SV:*:*)
@@ -1216,6 +1217,9 @@
     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
 	echo i586-pc-beos
 	exit ;;
+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
+	echo i586-pc-haiku
+	exit ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
 	exit ;;
@@ -1324,6 +1328,9 @@
     i*86:rdos:*:*)
 	echo ${UNAME_MACHINE}-pc-rdos
 	exit ;;
+    i*86:AROS:*:*)
+	echo ${UNAME_MACHINE}-pc-aros
+	exit ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
--- debathena-attach-10.0.1.orig/config.sub
+++ debathena-attach-10.0.1/config.sub
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 #   Free Software Foundation, Inc.
 
-timestamp='2008-01-16'
+timestamp='2009-06-11'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -122,6 +122,7 @@
 case $maybe_os in
   nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
   uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
@@ -152,6 +153,9 @@
 		os=
 		basic_machine=$1
 		;;
+        -bluegene*)
+	        os=-cnk
+		;;
 	-sim | -cisco | -oki | -wec | -winbond)
 		os=
 		basic_machine=$1
@@ -249,13 +253,16 @@
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
+	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore | mep \
+	| maxq | mb | microblaze | mcore | mep | metag \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
-	| mips64vr | mips64vrel \
+	| mips64octeon | mips64octeonel \
 	| mips64orion | mips64orionel \
+	| mips64r5900 | mips64r5900el \
+	| mips64vr | mips64vrel \
 	| mips64vr4100 | mips64vr4100el \
 	| mips64vr4300 | mips64vr4300el \
 	| mips64vr5000 | mips64vr5000el \
@@ -268,6 +275,7 @@
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
+	| moxie \
 	| mt \
 	| msp430 \
 	| nios | nios2 \
@@ -277,7 +285,7 @@
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
 	| score \
-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
@@ -286,7 +294,7 @@
 	| v850 | v850e \
 	| we32k \
 	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
-	| z8k)
+	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
 	m6811 | m68hc11 | m6812 | m68hc12)
@@ -329,14 +337,17 @@
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
+	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
-	| mips64vr-* | mips64vrel-* \
+	| mips64octeon-* | mips64octeonel-* \
 	| mips64orion-* | mips64orionel-* \
+	| mips64r5900-* | mips64r5900el-* \
+	| mips64vr-* | mips64vrel-* \
 	| mips64vr4100-* | mips64vr4100el-* \
 	| mips64vr4300-* | mips64vr4300el-* \
 	| mips64vr5000-* | mips64vr5000el-* \
@@ -358,20 +369,20 @@
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
 	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
 	| tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
 	| xstormy16-* | xtensa*-* \
 	| ymp-* \
-	| z8k-*)
+	| z8k-* | z80-*)
 		;;
 	# Recognize the basic CPU types without company name, with glob match.
 	xtensa*)
@@ -439,6 +450,10 @@
 		basic_machine=m68k-apollo
 		os=-bsd
 		;;
+	aros)
+		basic_machine=i386-pc
+		os=-aros
+		;;
 	aux)
 		basic_machine=m68k-apple
 		os=-aux
@@ -455,10 +470,18 @@
 		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
 		os=-linux
 		;;
+	bluegene*)
+		basic_machine=powerpc-ibm
+		os=-cnk
+		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
 		;;
+        cegcc)
+		basic_machine=arm-unknown
+		os=-cegcc
+		;;
 	convex-c1)
 		basic_machine=c1-convex
 		os=-bsd
@@ -526,6 +549,10 @@
 		basic_machine=m88k-motorola
 		os=-sysv3
 		;;
+	dicos)
+		basic_machine=i686-pc
+		os=-dicos
+		;;
 	djgpp)
 		basic_machine=i586-pc
 		os=-msdosdjgpp
@@ -1128,6 +1155,10 @@
 		basic_machine=z8k-unknown
 		os=-sim
 		;;
+	z80-*-coff)
+		basic_machine=z80-unknown
+		os=-sim
+		;;
 	none)
 		basic_machine=none-none
 		os=-none
@@ -1166,7 +1197,7 @@
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
 	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
@@ -1236,10 +1267,11 @@
 	# Each alternative MUST END IN A *, to match a version number.
 	# -sysv* is not here because it comes later, after sysvr4.
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+	      | -kopensolaris* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* \
+	      | -aos* | -aros* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
@@ -1248,7 +1280,7 @@
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* \
+	      | -chorusos* | -chorusrdb* | -cegcc* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* \
@@ -1388,6 +1420,9 @@
 	-zvmoe)
 		os=-zvmoe
 		;;
+	-dicos*)
+		os=-dicos
+		;;
 	-none)
 		;;
 	*)
@@ -1585,7 +1620,7 @@
 			-sunos*)
 				vendor=sun
 				;;
-			-aix*)
+			-cnk*|-aix*)
 				vendor=ibm
 				;;
 			-beos*)
--- debathena-attach-10.0.1.orig/debian/debathena-attach.postinst
+++ debathena-attach-10.0.1/debian/debathena-attach.postinst
@@ -0,0 +1,46 @@
+#!/bin/sh
+# postinst script for debathena-attach
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    configure)
+	# Setup attach binary for setgid-attach.
+	if ! dpkg-statoverride --list /bin/attach >/dev/null; then
+	    chgrp attach /bin/attach
+	    chmod a=rx,u+w,g+s /bin/attach
+	fi
+	;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+	;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
--- debathena-attach-10.0.1.orig/debian/control
+++ debathena-attach-10.0.1/debian/control
@@ -0,0 +1,15 @@
+Source: debathena-attach
+Section: debathena/net
+Priority: extra
+Maintainer: Debathena Project <debathena@mit.edu>
+Build-Depends: cdbs, autotools-dev, debhelper, autoconf, libopenafs-dev, libhesiod-dev, libzephyr-dev, debathena-liblocker-dev, debathena-libathdir-dev
+Standards-Version: 3.7.2
+
+Package: debathena-attach
+Architecture: any
+Provides: attach
+Depends: ${shlibs:Depends}, ${misc:Depends}, libzephyr4-krb5 | libzephyr3-krb, debathena-liblocker (>= 9.4), zephyr-clients
+Description: An Athena utility to attach a remote file system to the workstation
+ The attach utility is a filesystem-independent utility which allows you 
+ to attach a filesystem to a directory hierarchy on a workstation.  
+ Currently supported filesystem types are AFS, NFS, and UFS.
--- debathena-attach-10.0.1.orig/debian/compat
+++ debathena-attach-10.0.1/debian/compat
@@ -0,0 +1 @@
+4
--- debathena-attach-10.0.1.orig/debian/control.in
+++ debathena-attach-10.0.1/debian/control.in
@@ -0,0 +1,15 @@
+Source: debathena-attach
+Section: debathena/net
+Priority: extra
+Maintainer: Debathena Project <debathena@mit.edu>
+Build-Depends: @cdbs@, libopenafs-dev, libhesiod-dev, libzephyr-dev, debathena-liblocker-dev, debathena-libathdir-dev
+Standards-Version: 3.7.2
+
+Package: debathena-attach
+Architecture: any
+Provides: attach
+Depends: ${shlibs:Depends}, ${misc:Depends}, libzephyr4-krb5 | libzephyr3-krb, debathena-liblocker (>= 9.4), zephyr-clients
+Description: An Athena utility to attach a remote file system to the workstation
+ The attach utility is a filesystem-independent utility which allows you 
+ to attach a filesystem to a directory hierarchy on a workstation.  
+ Currently supported filesystem types are AFS, NFS, and UFS.
--- debathena-attach-10.0.1.orig/debian/changelog
+++ debathena-attach-10.0.1/debian/changelog
@@ -0,0 +1,68 @@
+debathena-attach (10.0.1-0debathena2) unstable; urgency=low
+
+  * Fix the attach man page
+
+ -- Jonathan Reed <jdreed@mit.edu>  Fri, 19 Mar 2010 18:17:42 -0400
+
+debathena-attach (10.0.1-0debathena1) unstable; urgency=low
+
+  * Now that liblocker doesn't require krb4, don't require it here either.
+  * Since Debathena is building liblocker without krb4, don't build with
+    it here either.
+
+ -- Evan Broder <broder@mit.edu>  Mon, 12 Oct 2009 14:56:01 -0400
+
+debathena-attach (10.0.0-0debathena2) unstable; urgency=low
+
+  * Change DEB_AUTO_UPDATE_AUTOCONF to 2.50, not 1.
+  * Remove DEB_AUTO_UPDATE_DEBIAN_CONTROL.
+  * Change "Debian-Athena Project" to "Debathena Project".
+  * Remove debian/control from version control.
+  * Clean up debian/copyright.
+
+ -- Tim Abbott <tabbott@mit.edu>  Sat, 24 Jan 2009 14:29:05 -0500
+
+debathena-attach (10.0.0-0debathena1) unstable; urgency=low
+
+  * Merged quilt patches into mainline Athena tree
+
+ -- Shreevatsa R <vatsa@mit.edu>  Sun,  6 Apr 2008 15:46:07 -0400
+
+debathena-attach (9.4.30-0debathena6) unstable; urgency=low
+
+  * Link against libcom_err from openafs so that the package builds on
+    lenny.
+  * Make MANPATH default to ":" instead of "", so that local manpages
+    continue to work.
+
+ -- Anders Kaseorg <andersk@mit.edu>  Tue, 01 Jan 2008 17:44:37 -0500
+
+debathena-attach (9.4.30-0debathena5) unstable; urgency=low
+
+  * Section: debathena/net.
+
+ -- Anders Kaseorg <andersk@mit.edu>  Tue, 17 Jul 2007 06:33:36 -0400
+
+debathena-attach (9.4.30-0debathena4) unstable; urgency=low
+
+  * Depend zephyr-clients (for zhm) so that fsid works.
+
+ -- Anders Kaseorg <andersk@mit.edu>  Tue, 26 Jun 2007 17:46:27 -0400
+
+debathena-attach (9.4.30-0debathena3) unstable; urgency=low
+
+  * Modified to be setgid attach.
+
+ -- Tim Abbott <tabbott@mit.edu>  Sat, 28 Apr 2007 22:41:24 -0400
+
+debathena-attach (9.4.30-0debathena2) unstable; urgency=low
+
+  * Rebuild against new debathena-liblocker.
+
+ -- Anders Kaseorg <andersk@mit.edu>  Tue, 24 Apr 2007 19:54:24 -0400
+
+debathena-attach (9.4.30-0debathena1) unstable; urgency=low
+
+  * Initial release.
+
+ -- Anders Kaseorg <andersk@mit.edu>  Tue, 30 Jan 2007 01:06:14 -0500
--- debathena-attach-10.0.1.orig/debian/copyright
+++ debathena-attach-10.0.1/debian/copyright
@@ -0,0 +1,23 @@
+This package was debianized as part of the Debathena Project
+<http://debathena.mit.edu/> of the MIT Student Information Processing
+Board.
+
+The Athena source code was obtained from the Athena SVN repository at
+<svn://debathena.mit.edu/athena/trunk>, and is licensed as follows:
+
+  Copyright © 1996 by the Massachusetts Institute of Technology.
+
+  Permission to use, copy, modify, and distribute this
+  software and its documentation for any purpose and without
+  fee is hereby granted, provided that the above copyright
+  notice appear in all copies and that both that copyright
+  notice and this permission notice appear in supporting
+  documentation, and that the name of M.I.T. not be used in
+  advertising or publicity pertaining to distribution of the
+  software without specific, written prior permission.
+  M.I.T. makes no representations about the suitability of
+  this software for any purpose.  It is provided "as is"
+  without express or implied warranty.
+
+The Debian packaging is Copyright © 2007-2008 Tim Abbott and Anders
+Kaseorg, and has the same license as the original software.
--- debathena-attach-10.0.1.orig/debian/rules
+++ debathena-attach-10.0.1/debian/rules
@@ -0,0 +1,10 @@
+#!/usr/bin/make -f
+
+DEB_AUTO_UPDATE_AUTOCONF = 2.50
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+
+DEB_CONFIGURE_EXTRA_FLAGS += lbindir=/bin lsbindir=/sbin --with-afs=/usr --without-krb4 --with-hesiod LIBS=/usr/lib/afs/libcom_err.a
+
+clean::
+	rm -f configure
