--- ircd-ircu-2.10.11.04.dfsg1.orig/doc/exaconf
+++ ircd-ircu-2.10.11.04.dfsg1/doc/exaconf
@@ -0,0 +1,211 @@
+# Set the name of the server, its numeric, and the server info field
+serverinfo {
+	name "test.server.undernet.org";
+	capacity 6124;
+	numeric 18;
+	description "A test server for the next generation";
+
+	# this is an optional parameter to specify where outbound
+	# connections should originate from
+	addr "18.177.0.118";
+}
+
+# Select a seed from /dev/random or the appropriate local alternative.
+# If /dev/random doesn't exist, use a seed
+# Note: on Linux, /dev/urandom should probably be used--it won't block.
+seedfile "/dev/random";
+
+# Let's set up some logging
+logging {
+	syslog daemon; # set the syslog facility to daemon
+
+	logpath "/home/irc/logs" # path prepended to log file names
+
+	log kill syslog notice; # log kills to syslog at priority "notice"
+	log squit syslog notice;
+	log connect syslog debug;
+
+	log oper file "opers.log"; # log /opers to file "opers.log"
+	log gline file "gline.log";
+
+	nolog users; # turn off logging for users (default, but illustrative)
+
+	pid "ircd.pid";
+}
+
+binpath "/home/irc/bin/ircd"; # binary to exec() when we /restart
+libpath "/home/irc/lib"; # directory to chdir() to on start-up
+
+# Here's an authorization record--defines who is permitted on the server
+# and what special information needs to be remembered about them.
+auth everyone {
+	host "*@*";	# hosts this auth record matches
+	maxusers 1200;	# Max users for this auth record
+	perhost 2;	# Maximum of 2 users per host on this server
+	global 3;	# Maximum of 2 users per host on the entire network
+	ping 120;	# ping them once every 120 seconds if link inactive
+	sendq 270000;	# max sendq for everyone in the auth record
+}
+
+# Here's another one for miters people
+auth miters {
+	host "*@*.mit.edu";
+	host "*@18.*";
+	maxusers 1200;
+	perhost 1;
+	global 1;
+	ping 300;
+	sendq 120000;
+}
+
+# And here's a back door for my operators--perhaps to be used in an emergency
+auth opers {
+	host "*@*";
+	unset ident;	# no identd
+	unset banable;	# no denial rules
+	unset limit;	# ignore any limits
+	set ipspoof;	# hostname is spoofed to protect the guilty
+	password "MybacKd004!"; # password-only access
+	motd "opers.motd";	# a special MOTD for opers
+}
+
+port {
+	accept opers; # auth records are tried in order listed
+	accept miters;
+	accept everyone;
+
+	port 6660-6669 "18.177.0.118"; # ports to open
+	port 6660-6669 "18.177.0.119";
+}
+
+port {
+	set hide;
+
+	accept opers;
+
+	port 7000; # IP is optional and defaults to 0.0.0.0
+}
+
+port {
+	set hide;
+	set serveronly;
+
+	port 4400 "18.177.0.118";
+}
+
+# allow channel hacks and glines
+server uworld.undernet.org {
+	set channelhack;
+	set gline;
+}
+
+server uworld2.undernet.org {
+	set channelhack;
+	set gline;
+}
+
+server uworld.eu.undernet.org {
+	set channelhack;
+	set gline;
+}
+
+# allow channel hacks only
+server channels.undernet.org {
+	set channelhack;
+}
+
+server channels2.undernet.org {
+	set channelhack;
+}
+
+# here's some link class definitions for servers (only)
+class hubs {
+	limit 2;	# Max connection attempts per class
+	freq 600;	# Connect frequency
+	ping 300;	# how often to ping them
+	sendq 2700000;	# sendq
+}
+
+# Here's a hub link
+server santaclara.ca.us.undernet.org {
+	class hubs;			# this is in the hubs link class
+
+	link 4400 "205.158.23.3";	# link address
+	password "toysrus";		# link password
+	set auto;			# we'll auto to it
+	set hub;			# it's a hub
+}
+
+server dallas-r.tx.us.undernet.org {
+	class hubs;
+
+	link 4400 "204.178.73.175";
+	password "areyouready?";
+	set auto;
+	set hub;
+
+	deny "linked(santaclara.ca.us.undernet.org)"; # a d-line
+}
+
+# here's a leaf
+server vancouver.bc.ca.undernet.org {
+	link 4400 "199.60.228.129";
+	password "toylink";
+	set auto;
+
+	denyoper "linked(santaclara.ca.us.undernet.org)"; # a D-line
+}
+
+# here's a set of default flags for opers
+#
+# the part before the '.' specifies the namespace the flags are from--
+# not necessary inside the user record itself, but we don't otherwise
+# know the namespace here.  The part after the '.' is a label.
+flagset user.oper {
+	set kill;	# allow kills...
+	set kline;	# allow kline/unkline
+	set gline;	# allow local glines
+	set rehash;	# can use /rehash
+	set restart;	# can use /restart
+	set die;	# can use /die
+	set wallops;	# can use /wallops
+	set connect;	# can use /connect and /squit
+	set stats;	# can use /stats
+	set info;	# can use /info
+	set opernotice;	# can see oper-only notices
+	set massmsg;	# can use mass messages
+}
+
+# here's an operator
+user Kev {
+	default oper;			# a set of flags for the user
+	cryptpass "J/7oDe78NhQ+/";	# password must be given to activate
+	host "*.mit.edu";		# must be from the listed hosts
+	host "*.ne.mediaone.net";
+	host "18.*";
+	host "168.159.*";
+}
+
+# nick jupes
+user Uworld {
+	set juped;
+}
+
+user Uworld2 {
+	set juped;
+}
+
+user EUworld {
+	set juped;
+}
+
+user X {
+	set juped;
+}
+
+user W {
+	set juped;
+}
+
+# File deny records are kept in; this can be modified from online
+denyfile "klines.conf";
--- ircd-ircu-2.10.11.04.dfsg1.orig/config.guess
+++ ircd-ircu-2.10.11.04.dfsg1/config.guess
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
-timestamp='2002-03-04'
+timestamp='2006-02-23'
 
 # 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
@@ -17,13 +17,15 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
+
 # Originally written by Per Bothner <per@bothner.com>.
 # Please send patches to <config-patches@gnu.org>.  Submit a context
 # diff and a properly formatted ChangeLog entry.
@@ -53,7 +55,7 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -66,11 +68,11 @@
 while test $# -gt 0 ; do
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
+       echo "$timestamp" ; exit ;;
     --version | -v )
-       echo "$version" ; exit 0 ;;
+       echo "$version" ; exit ;;
     --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
+       echo "$usage"; exit ;;
     -- )     # Stop option processing
        shift; break ;;
     - )	# Use stdin as input.
@@ -88,30 +90,42 @@
   exit 1
 fi
 
+trap 'exit 1' 1 2 15
 
-dummy=dummy-$$
-trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+# compiler to aid in system detection is discouraged as it requires
+# temporary files to be created and, as you can see below, it is a
+# headache to deal with in a portable fashion.
 
-# CC_FOR_BUILD -- compiler used by this script.
 # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
 # use `HOST_CC' if defined, but it is deprecated.
 
-set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int dummy(){}" > $dummy.c ;
-	for c in cc gcc c89 ; do
-	  ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
-	  if test $? = 0 ; then
+# Portable tmp directory creation inspired by the Autoconf team.
+
+set_cc_for_build='
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+: ${TMPDIR=/tmp} ;
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+dummy=$tmp/dummy ;
+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
+case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,)    echo "int x;" > $dummy.c ;
+	for c in cc gcc c89 c99 ; do
+	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
 	     CC_FOR_BUILD="$c"; break ;
 	  fi ;
 	done ;
-	rm -f $dummy.c $dummy.o $dummy.rel ;
 	if test x"$CC_FOR_BUILD" = x ; then
 	  CC_FOR_BUILD=no_compiler_found ;
 	fi
 	;;
  ,,*)   CC_FOR_BUILD=$CC ;;
  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac'
+esac ; set_cc_for_build= ;'
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 1994-08-24)
@@ -142,6 +156,7 @@
 	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
 	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
 	case "${UNAME_MACHINE_ARCH}" in
+	    armeb) machine=armeb-unknown ;;
 	    arm*) machine=arm-unknown ;;
 	    sh3el) machine=shl-unknown ;;
 	    sh3eb) machine=sh-unknown ;;
@@ -167,141 +182,128 @@
 		;;
 	esac
 	# The OS release
-	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+	# Debian GNU/NetBSD machines have a different userland, and
+	# thus, need a distinct triplet. However, they do not need
+	# kernel version information, so it can be replaced with a
+	# suitable tag, in the style of linux-gnu.
+	case "${UNAME_VERSION}" in
+	    Debian*)
+		release='-gnu'
+		;;
+	    *)
+		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+		;;
+	esac
 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
-	exit 0 ;;
-    amiga:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    arc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    hp300:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mac68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    macppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme88k:OpenBSD:*:*)
-	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvmeppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    pmax:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sgi:OpenBSD:*:*)
-	echo mipseb-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sun3:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    wgrisc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:OpenBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
+	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+	exit ;;
+    *:ekkoBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+	exit ;;
+    *:SolidBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+	exit ;;
+    macppc:MirBSD:*:*)
+	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+	exit ;;
+    *:MirBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+	exit ;;
     alpha:OSF1:*:*)
-	if test $UNAME_RELEASE = "V4.0"; then
+	case $UNAME_RELEASE in
+	*4.0)
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-	fi
+		;;
+	*5.*)
+	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		;;
+	esac
+	# According to Compaq, /usr/sbin/psrinfo has been available on
+	# OSF/1 and Tru64 systems produced since 1995.  I hope that
+	# covers most systems running today.  This code pipes the CPU
+	# types through head -n 1, so we only detect the type of CPU 0.
+	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
+	case "$ALPHA_CPU_TYPE" in
+	    "EV4 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV4.5 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "LCA4 (21066/21068)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV5 (21164)")
+		UNAME_MACHINE="alphaev5" ;;
+	    "EV5.6 (21164A)")
+		UNAME_MACHINE="alphaev56" ;;
+	    "EV5.6 (21164PC)")
+		UNAME_MACHINE="alphapca56" ;;
+	    "EV5.7 (21164PC)")
+		UNAME_MACHINE="alphapca57" ;;
+	    "EV6 (21264)")
+		UNAME_MACHINE="alphaev6" ;;
+	    "EV6.7 (21264A)")
+		UNAME_MACHINE="alphaev67" ;;
+	    "EV6.8CB (21264C)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8AL (21264B)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8CX (21264D)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.9A (21264/EV69A)")
+		UNAME_MACHINE="alphaev69" ;;
+	    "EV7 (21364)")
+		UNAME_MACHINE="alphaev7" ;;
+	    "EV7.9 (21364A)")
+		UNAME_MACHINE="alphaev79" ;;
+	esac
+	# A Pn.n version is a patched version.
 	# A Vn.n version is a released version.
 	# A Tn.n version is a released field test version.
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
-	cat <<EOF >$dummy.s
-	.data
-\$Lformat:
-	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
-
-	.text
-	.globl main
-	.align 4
-	.ent main
-main:
-	.frame \$30,16,\$26,0
-	ldgp \$29,0(\$27)
-	.prologue 1
-	.long 0x47e03d80 # implver \$0
-	lda \$2,-1
-	.long 0x47e20c21 # amask \$2,\$1
-	lda \$16,\$Lformat
-	mov \$0,\$17
-	not \$1,\$18
-	jsr \$26,printf
-	ldgp \$29,0(\$26)
-	mov 0,\$16
-	jsr \$26,exit
-	.end main
-EOF
-	eval $set_cc_for_build
-	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
-	if test "$?" = 0 ; then
-		case `./$dummy` in
-			0-0)
-				UNAME_MACHINE="alpha"
-				;;
-			1-0)
-				UNAME_MACHINE="alphaev5"
-				;;
-			1-1)
-				UNAME_MACHINE="alphaev56"
-				;;
-			1-101)
-				UNAME_MACHINE="alphapca56"
-				;;
-			2-303)
-				UNAME_MACHINE="alphaev6"
-				;;
-			2-307)
-				UNAME_MACHINE="alphaev67"
-				;;
-			2-1307)
-				UNAME_MACHINE="alphaev68"
-				;;
-		esac
-	fi
-	rm -f $dummy.s $dummy
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit 0 ;;
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	exit ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
 	# of the specific Alpha model?
 	echo alpha-pc-interix
-	exit 0 ;;
+	exit ;;
     21064:Windows_NT:50:3)
 	echo alpha-dec-winnt3.5
-	exit 0 ;;
+	exit ;;
     Amiga*:UNIX_System_V:4.0:*)
 	echo m68k-unknown-sysv4
-	exit 0;;
+	exit ;;
     *:[Aa]miga[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit 0 ;;
+	exit ;;
     *:[Mm]orph[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-morphos
-	exit 0 ;;
+	exit ;;
     *:OS/390:*:*)
 	echo i370-ibm-openedition
-	exit 0 ;;
+	exit ;;
+    *:z/VM:*:*)
+	echo s390-ibm-zvmoe
+	exit ;;
+    *:OS400:*:*)
+        echo powerpc-ibm-os400
+	exit ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit 0;;
+	exit ;;
+    arm:riscos:*:*|arm:RISCOS:*:*)
+	echo arm-unknown-riscos
+	exit ;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
 	echo hppa1.1-hitachi-hiuxmpp
-	exit 0;;
+	exit ;;
     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
 	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
 	if test "`(/bin/universe) 2>/dev/null`" = att ; then
@@ -309,25 +311,32 @@
 	else
 		echo pyramid-pyramid-bsd
 	fi
-	exit 0 ;;
+	exit ;;
     NILE*:*:*:dcosx)
 	echo pyramid-pyramid-svr4
-	exit 0 ;;
+	exit ;;
+    DRS?6000:unix:4.0:6*)
+	echo sparc-icl-nx6
+	exit ;;
+    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
+	case `/usr/bin/uname -p` in
+	    sparc) echo sparc-icl-nx7; exit ;;
+	esac ;;
     sun4H:SunOS:5.*:*)
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     i86pc:SunOS:5.*:*)
 	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     sun4*:SunOS:6*:*)
 	# According to config.sub, this is the proper way to canonicalize
 	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
 	# it's likely to be more like Solaris than SunOS4.
 	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     sun4*:SunOS:*:*)
 	case "`/usr/bin/arch -k`" in
 	    Series*|S4*)
@@ -336,10 +345,10 @@
 	esac
 	# Japanese Language versions have a version number like `4.1.3-JL'.
 	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit 0 ;;
+	exit ;;
     sun3*:SunOS:*:*)
 	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     sun*:*:4.2BSD:*)
 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
 	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
@@ -351,10 +360,10 @@
 		echo sparc-sun-sunos${UNAME_RELEASE}
 		;;
 	esac
-	exit 0 ;;
+	exit ;;
     aushp:SunOS:*:*)
 	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     # The situation for MiNT is a little confusing.  The machine name
     # can be virtually everything (everything which is not
     # "atarist" or "atariste" at least should have a processor
@@ -365,37 +374,40 @@
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
         echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
         echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
         echo m68k-milan-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
         echo m68k-hades-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
         echo m68k-unknown-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
+    m68k:machten:*:*)
+	echo m68k-apple-machten${UNAME_RELEASE}
+	exit ;;
     powerpc:machten:*:*)
 	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     RISC*:Mach:*:*)
 	echo mips-dec-mach_bsd4.3
-	exit 0 ;;
+	exit ;;
     RISC*:ULTRIX:*:*)
 	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     VAX*:ULTRIX*:*:*)
 	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     2020:CLIX:*:* | 2430:CLIX:*:*)
 	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -419,27 +431,33 @@
 	  exit (-1);
 	}
 EOF
-	$CC_FOR_BUILD $dummy.c -o $dummy \
-	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && rm -f $dummy.c $dummy && exit 0
-	rm -f $dummy.c $dummy
+	$CC_FOR_BUILD -o $dummy $dummy.c &&
+	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+	  SYSTEM_NAME=`$dummy $dummyarg` &&
+	    { echo "$SYSTEM_NAME"; exit; }
 	echo mips-mips-riscos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     Motorola:PowerMAX_OS:*:*)
 	echo powerpc-motorola-powermax
-	exit 0 ;;
+	exit ;;
+    Motorola:*:4.3:PL8-*)
+	echo powerpc-harris-powermax
+	exit ;;
+    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+	echo powerpc-harris-powermax
+	exit ;;
     Night_Hawk:Power_UNIX:*:*)
 	echo powerpc-harris-powerunix
-	exit 0 ;;
+	exit ;;
     m88k:CX/UX:7*:*)
 	echo m88k-harris-cxux7
-	exit 0 ;;
+	exit ;;
     m88k:*:4*:R4*)
 	echo m88k-motorola-sysv4
-	exit 0 ;;
+	exit ;;
     m88k:*:3*:R3*)
 	echo m88k-motorola-sysv3
-	exit 0 ;;
+	exit ;;
     AViiON:dgux:*:*)
         # DG/UX returns AViiON for all architectures
         UNAME_PROCESSOR=`/usr/bin/uname -p`
@@ -455,29 +473,29 @@
 	else
 	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
- 	exit 0 ;;
+ 	exit ;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
-	exit 0 ;;
+	exit ;;
     M88*:*:R3*:*)
 	# Delta 88k system running SVR3
 	echo m88k-motorola-sysv3
-	exit 0 ;;
+	exit ;;
     XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
 	echo m88k-tektronix-sysv3
-	exit 0 ;;
+	exit ;;
     Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
 	echo m68k-tektronix-bsd
-	exit 0 ;;
+	exit ;;
     *:IRIX*:*:*)
 	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit 0 ;;
+	exit ;;
     ????????: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 '
+	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
+	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
     i*86:AIX:*:*)
 	echo i386-ibm-aix
-	exit 0 ;;
+	exit ;;
     ia64:AIX:*:*)
 	if [ -x /usr/bin/oslevel ] ; then
 		IBM_REV=`/usr/bin/oslevel`
@@ -485,7 +503,7 @@
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
 	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit 0 ;;
+	exit ;;
     *:AIX:2:3)
 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
 		eval $set_cc_for_build
@@ -500,15 +518,18 @@
 			exit(0);
 			}
 EOF
-		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
-		rm -f $dummy.c $dummy
-		echo rs6000-ibm-aix3.2.5
+		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+		then
+			echo "$SYSTEM_NAME"
+		else
+			echo rs6000-ibm-aix3.2.5
+		fi
 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
 		echo rs6000-ibm-aix3.2.4
 	else
 		echo rs6000-ibm-aix3.2
 	fi
-	exit 0 ;;
+	exit ;;
     *:AIX:*:[45])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
@@ -522,28 +543,28 @@
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit 0 ;;
+	exit ;;
     *:AIX:*:*)
 	echo rs6000-ibm-aix
-	exit 0 ;;
+	exit ;;
     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
 	echo romp-ibm-bsd4.4
-	exit 0 ;;
+	exit ;;
     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
 	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit 0 ;;                           # report: romp-ibm BSD 4.3
+	exit ;;                             # report: romp-ibm BSD 4.3
     *:BOSX:*:*)
 	echo rs6000-bull-bosx
-	exit 0 ;;
+	exit ;;
     DPX/2?00:B.O.S.:*:*)
 	echo m68k-bull-sysv3
-	exit 0 ;;
+	exit ;;
     9000/[34]??:4.3bsd:1.*:*)
 	echo m68k-hp-bsd
-	exit 0 ;;
+	exit ;;
     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
 	echo m68k-hp-bsd4.4
-	exit 0 ;;
+	exit ;;
     9000/[34678]??:HP-UX:*:*)
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	case "${UNAME_MACHINE}" in
@@ -599,17 +620,37 @@
                   exit (0);
               }
 EOF
-		    (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`./$dummy`
-		    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
-		    rm -f $dummy.c $dummy
+		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+		    test -z "$HP_ARCH" && HP_ARCH=hppa
 		fi ;;
 	esac
+	if [ ${HP_ARCH} = "hppa2.0w" ]
+	then
+	    eval $set_cc_for_build
+
+	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
+	    # generating 64-bit code.  GNU and HP use different nomenclature:
+	    #
+	    # $ CC_FOR_BUILD=cc ./config.guess
+	    # => hppa2.0w-hp-hpux11.23
+	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+	    # => hppa64-hp-hpux11.23
+
+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+		grep __LP64__ >/dev/null
+	    then
+		HP_ARCH="hppa2.0w"
+	    else
+		HP_ARCH="hppa64"
+	    fi
+	fi
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit 0 ;;
+	exit ;;
     ia64:HP-UX:*:*)
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	echo ia64-hp-hpux${HPUX_REV}
-	exit 0 ;;
+	exit ;;
     3050*:HI-UX:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -637,160 +678,232 @@
 	  exit (0);
 	}
 EOF
-	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
-	rm -f $dummy.c $dummy
+	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+		{ echo "$SYSTEM_NAME"; exit; }
 	echo unknown-hitachi-hiuxwe2
-	exit 0 ;;
+	exit ;;
     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
 	echo hppa1.1-hp-bsd
-	exit 0 ;;
+	exit ;;
     9000/8??:4.3bsd:*:*)
 	echo hppa1.0-hp-bsd
-	exit 0 ;;
+	exit ;;
     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
 	echo hppa1.0-hp-mpeix
-	exit 0 ;;
+	exit ;;
     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
 	echo hppa1.1-hp-osf
-	exit 0 ;;
+	exit ;;
     hp8??:OSF1:*:*)
 	echo hppa1.0-hp-osf
-	exit 0 ;;
+	exit ;;
     i*86:OSF1:*:*)
 	if [ -x /usr/sbin/sysversion ] ; then
 	    echo ${UNAME_MACHINE}-unknown-osf1mk
 	else
 	    echo ${UNAME_MACHINE}-unknown-osf1
 	fi
-	exit 0 ;;
+	exit ;;
     parisc*:Lites*:*:*)
 	echo hppa1.1-hp-lites
-	exit 0 ;;
+	exit ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
-        exit 0 ;;
+        exit ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-        exit 0 ;;
+        exit ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 	echo c34-convex-bsd
-        exit 0 ;;
+        exit ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 	echo c38-convex-bsd
-        exit 0 ;;
+        exit ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
-        exit 0 ;;
+        exit ;;
     CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*[A-Z]90:*:*:*)
 	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
 	      -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*TS:*:*:*)
 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*T3D:*:*:*)
-	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*T3E:*:*:*)
 	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*SV1:*:*:*)
 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
+    *:UNICOS/mp:*:*)
+	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit 0 ;;
+        exit ;;
+    5000:UNIX_System_V:4.*:*)
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     sparc*:BSD/OS:*:*)
 	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:BSD/OS:*:*)
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:FreeBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit 0 ;;
+	case ${UNAME_MACHINE} in
+	    pc98)
+		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    *)
+		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	esac
+	exit ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
-	exit 0 ;;
+	exit ;;
     i*:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
-	exit 0 ;;
+	exit ;;
+    i*:MSYS_NT-*:*:*)
+	echo ${UNAME_MACHINE}-pc-mingw32
+	exit ;;
+    i*:windows32*:*)
+    	# uname -m includes "-pc" on this system.
+    	echo ${UNAME_MACHINE}-mingw32
+	exit ;;
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
-	exit 0 ;;
-    x86:Interix*:3*)
-	echo i386-pc-interix3
-	exit 0 ;;
+	exit ;;
+    x86:Interix*:[345]*)
+	echo i586-pc-interix${UNAME_RELEASE}
+	exit ;;
+    EM64T:Interix*:[345]*)
+	echo x86_64-unknown-interix${UNAME_RELEASE}
+	exit ;;
+    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+	echo i${UNAME_MACHINE}-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
 	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i386-pc-interix
-	exit 0 ;;
+	echo i586-pc-interix
+	exit ;;
     i*:UWIN*:*)
 	echo ${UNAME_MACHINE}-pc-uwin
-	exit 0 ;;
+	exit ;;
+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+	echo x86_64-unknown-cygwin
+	exit ;;
     p*:CYGWIN*:*)
 	echo powerpcle-unknown-cygwin
-	exit 0 ;;
+	exit ;;
     prep*:SunOS:5.*:*)
 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     *:GNU:*:*)
+	# the GNU system
 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit 0 ;;
+	exit ;;
+    *:GNU/*:*:*)
+	# other systems with GNU libc and userland
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+	exit ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
-	exit 0 ;;
+	exit ;;
     arm*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
+    cris:Linux:*:*)
+	echo cris-axis-linux-gnu
+	exit ;;
+    crisv32:Linux:*:*)
+	echo crisv32-axis-linux-gnu
+	exit ;;
+    frv:Linux:*:*)
+    	echo frv-unknown-linux-gnu
+	exit ;;
     ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux
-	exit 0 ;;
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    m32r*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     mips:Linux:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
 	#undef CPU
 	#undef mips
 	#undef mipsel
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) 
-	CPU=mipsel 
+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+	CPU=mipsel
 	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) 
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
 	CPU=mips
 	#else
 	CPU=
 	#endif
-	#endif 
+	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	rm -f $dummy.c
-	test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0
+	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
+	#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; }
+	;;
+    or32:Linux:*:*)
+	echo or32-unknown-linux-gnu
+	exit ;;
     ppc:Linux:*:*)
 	echo powerpc-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     ppc64:Linux:*:*)
 	echo powerpc64-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
 	  EV5)   UNAME_MACHINE=alphaev5 ;;
@@ -804,7 +917,7 @@
 	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit 0 ;;
+	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -812,22 +925,28 @@
 	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
 	  *)    echo hppa-unknown-linux-gnu ;;
 	esac
-	exit 0 ;;
+	exit ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
 	echo hppa64-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
-	exit 0 ;;
+	exit ;;
+    sh64*:Linux:*:*)
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
+    vax:Linux:*:*)
+	echo ${UNAME_MACHINE}-dec-linux-gnu
+	exit ;;
     x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
-	exit 0 ;;
+	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
@@ -845,15 +964,15 @@
 		;;
 	  a.out-i386-linux)
 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit 0 ;;		
+		exit ;;
 	  coff-i386)
 		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit 0 ;;
+		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 0 ;;
+		exit ;;
 	esac
 	# Determine whether the default compiler is a.out or elf
 	eval $set_cc_for_build
@@ -870,24 +989,33 @@
 	LIBC=gnulibc1
 	# endif
 	#else
-	#ifdef __INTEL_COMPILER
+	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__sun)
 	LIBC=gnu
 	#else
 	LIBC=gnuaout
 	#endif
 	#endif
+	#ifdef __dietlibc__
+	LIBC=dietlibc
+	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	rm -f $dummy.c
-	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
-	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^LIBC/{
+		s: ::g
+		p
+	    }'`"
+	test x"${LIBC}" != x && {
+		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+		exit
+	}
+	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
 	;;
     i*86:DYNIX/ptx:4*:*)
 	# 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.
 	echo i386-sequent-sysv4
-	exit 0 ;;
+	exit ;;
     i*86:UNIX_SV:4.2MP:2.*)
         # Unixware is an offshoot of SVR4, but it has its own version
         # number series starting with 2...
@@ -895,7 +1023,27 @@
 	# I just have to hope.  -- rms.
         # Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit 0 ;;
+	exit ;;
+    i*86:OS/2:*:*)
+	# If we were able to find `uname', then EMX Unix compatibility
+	# is probably installed.
+	echo ${UNAME_MACHINE}-pc-os2-emx
+	exit ;;
+    i*86:XTS-300:*:STOP)
+	echo ${UNAME_MACHINE}-unknown-stop
+	exit ;;
+    i*86:atheos:*:*)
+	echo ${UNAME_MACHINE}-unknown-atheos
+	exit ;;
+    i*86:syllable:*:*)
+	echo ${UNAME_MACHINE}-pc-syllable
+	exit ;;
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+	echo i386-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    i*86:*DOS:*:*)
+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
+	exit ;;
     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
@@ -903,99 +1051,100 @@
 	else
 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
 	fi
-	exit 0 ;;
-    i*86:*:5:[78]*)
+	exit ;;
+    i*86:*:5:[678]*)
+    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 	case `/bin/uname -X | grep "^Machine"` in
 	    *486*)	     UNAME_MACHINE=i486 ;;
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
 	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
 	esac
 	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit 0 ;;
+	exit ;;
     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
 	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
+		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
 			&& UNAME_MACHINE=i586
-		(/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
+		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
 			&& UNAME_MACHINE=i686
-		(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
+		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
 			&& UNAME_MACHINE=i686
 		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
 	else
 		echo ${UNAME_MACHINE}-pc-sysv32
 	fi
-	exit 0 ;;
-    i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit 0 ;;
+	exit ;;
     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
-        exit 0 ;;
+        exit ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
-	exit 0 ;;
+	exit ;;
     paragon:*:*:*)
 	echo i860-intel-osf1
-	exit 0 ;;
+	exit ;;
     i860:*:4.*:*) # i860-SVR4
 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
 	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
 	else # Add other i860-SVR4 vendors below as they are discovered.
 	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
 	fi
-	exit 0 ;;
+	exit ;;
     mini*:CTIX:SYS*5:*)
 	# "miniframe"
 	echo m68010-convergent-sysv
-	exit 0 ;;
-    M68*:*:R3V[567]*:*)
-	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0)
+	exit ;;
+    mc68k:UNIX:SYSTEM5:3.51m)
+	echo m68k-convergent-sysv
+	exit ;;
+    M680?0:D-NIX:5.3:*)
+	echo m68k-diab-dnix
+	exit ;;
+    M68*:*:R3V[5678]*:*)
+	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
 	OS_REL=''
 	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 0
+	  && { 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 0 ;;
+	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && echo i486-ncr-sysv4 && exit 0 ;;
+          && { echo i486-ncr-sysv4; exit; } ;;
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
 	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     mc68030:UNIX_System_V:4.*:*)
 	echo m68k-atari-sysv4
-	exit 0 ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     TSUNAMI:LynxOS:2.*:*)
 	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     rs6000:LynxOS:2.*:*)
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     SM[BE]S:UNIX_SV:*:*)
 	echo mips-dde-sysv${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     RM*:ReliantUNIX-*:*:*)
 	echo mips-sni-sysv4
-	exit 0 ;;
+	exit ;;
     RM*:SINIX-*:*:*)
 	echo mips-sni-sysv4
-	exit 0 ;;
+	exit ;;
     *:SINIX-*:*:*)
 	if uname -p 2>/dev/null >/dev/null ; then
 		UNAME_MACHINE=`(uname -p) 2>/dev/null`
@@ -1003,84 +1152,98 @@
 	else
 		echo ns32k-sni-sysv
 	fi
-	exit 0 ;;
+	exit ;;
     PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
                       # says <Richard.M.Bartel@ccMail.Census.GOV>
         echo i586-unisys-sysv4
-        exit 0 ;;
+        exit ;;
     *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes@openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
 	echo hppa1.1-stratus-sysv4
-	exit 0 ;;
+	exit ;;
     *:*:*:FTX*)
 	# From seanf@swdc.stratus.com.
 	echo i860-stratus-sysv4
-	exit 0 ;;
+	exit ;;
+    i*86:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo ${UNAME_MACHINE}-stratus-vos
+	exit ;;
     *:VOS:*:*)
 	# From Paul.Green@stratus.com.
 	echo hppa1.1-stratus-vos
-	exit 0 ;;
+	exit ;;
     mc68*:A/UX:*:*)
 	echo m68k-apple-aux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     news*:NEWS-OS:6*:*)
 	echo mips-sony-newsos6
-	exit 0 ;;
+	exit ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
 	        echo mips-nec-sysv${UNAME_RELEASE}
 	else
 	        echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
-        exit 0 ;;
+        exit ;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 	echo powerpc-be-beos
-	exit 0 ;;
+	exit ;;
     BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
 	echo powerpc-apple-beos
-	exit 0 ;;
+	exit ;;
     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
 	echo i586-pc-beos
-	exit 0 ;;
+	exit ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     SX-5:SUPER-UX:*:*)
 	echo sx5-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
+    SX-6:SUPER-UX:*:*)
+	echo sx6-nec-superux${UNAME_RELEASE}
+	exit ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:Rhapsody:*:*)
 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:Darwin:*:*)
-	echo `uname -p`-apple-darwin${UNAME_RELEASE}
-	exit 0 ;;
+	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+	case $UNAME_PROCESSOR in
+	    unknown) UNAME_PROCESSOR=powerpc ;;
+	esac
+	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+	exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	if test "${UNAME_MACHINE}" = "x86pc"; then
+	UNAME_PROCESSOR=`uname -p`
+	if test "$UNAME_PROCESSOR" = "x86"; then
+		UNAME_PROCESSOR=i386
 		UNAME_MACHINE=pc
-		echo i386-${UNAME_MACHINE}-nto-qnx
-	else
-		echo `uname -p`-${UNAME_MACHINE}-nto-qnx
 	fi
-	exit 0 ;;
+	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+	exit ;;
     *:QNX:*:4*)
 	echo i386-pc-qnx
-	exit 0 ;;
-    NSR-[GKLNPTVW]:NONSTOP_KERNEL:*:*)
+	exit ;;
+    NSE-?:NONSTOP_KERNEL:*:*)
+	echo nse-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    NSR-?:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:NonStop-UX:*:*)
 	echo mips-compaq-nonstopux
-	exit 0 ;;
+	exit ;;
     BS2000:POSIX*:*:*)
 	echo bs2000-siemens-sysv
-	exit 0 ;;
+	exit ;;
     DS/*:UNIX_System_V:*:*)
 	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:Plan9:*:*)
 	# "uname -m" is not consistent, so use $cputype instead. 386
 	# is converted to i386 for consistency with other x86
@@ -1091,36 +1254,47 @@
 	    UNAME_MACHINE="$cputype"
 	fi
 	echo ${UNAME_MACHINE}-unknown-plan9
-	exit 0 ;;
-    i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit 0 ;;
+	exit ;;
     *:TOPS-10:*:*)
 	echo pdp10-unknown-tops10
-	exit 0 ;;
+	exit ;;
     *:TENEX:*:*)
 	echo pdp10-unknown-tenex
-	exit 0 ;;
+	exit ;;
     KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
 	echo pdp10-dec-tops20
-	exit 0 ;;
+	exit ;;
     XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
 	echo pdp10-xkl-tops20
-	exit 0 ;;
+	exit ;;
     *:TOPS-20:*:*)
 	echo pdp10-unknown-tops20
-	exit 0 ;;
+	exit ;;
     *:ITS:*:*)
 	echo pdp10-unknown-its
-	exit 0 ;;
-    i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
-	exit 0 ;;
-    i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-unknown-atheos
-	exit 0 ;;
+	exit ;;
+    SEI:*:*:SEIUX)
+        echo mips-sei-seiux${UNAME_RELEASE}
+	exit ;;
+    *:DragonFly:*:*)
+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	exit ;;
+    *:*VMS:*:*)
+    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	case "${UNAME_MACHINE}" in
+	    A*) echo alpha-dec-vms ; exit ;;
+	    I*) echo ia64-dec-vms ; exit ;;
+	    V*) echo vax-dec-vms ; exit ;;
+	esac ;;
+    *:XENIX:*:SysV)
+	echo i386-pc-xenix
+	exit ;;
+    i*86:skyos:*:*)
+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+	exit ;;
+    i*86:rdos:*:*)
+	echo ${UNAME_MACHINE}-pc-rdos
+	exit ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1152,7 +1326,7 @@
 #endif
 
 #if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix"); exit (0);
+  printf ("arm-acorn-riscix\n"); exit (0);
 #endif
 
 #if defined (hp300) && !defined (hpux)
@@ -1241,12 +1415,12 @@
 }
 EOF
 
-$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
-rm -f $dummy.c $dummy
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+	{ echo "$SYSTEM_NAME"; exit; }
 
 # Apollos put the system type in the environment.
 
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
 
 # Convex versions that predate uname can use getsysinfo(1)
 
@@ -1255,22 +1429,22 @@
     case `getsysinfo -f cpu_type` in
     c1*)
 	echo c1-convex-bsd
-	exit 0 ;;
+	exit ;;
     c2*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-	exit 0 ;;
+	exit ;;
     c34*)
 	echo c34-convex-bsd
-	exit 0 ;;
+	exit ;;
     c38*)
 	echo c38-convex-bsd
-	exit 0 ;;
+	exit ;;
     c4*)
 	echo c4-convex-bsd
-	exit 0 ;;
+	exit ;;
     esac
 fi
 
@@ -1281,7 +1455,9 @@
 the operating system you are using. It is advised that you
 download the most up to date version of the config scripts from
 
-    ftp://ftp.gnu.org/pub/gnu/config/
+  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
+and
+  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
 
 If the version you run ($0) is already up to date, please
 send the following data and any information you think might be
--- ircd-ircu-2.10.11.04.dfsg1.orig/config.sub
+++ ircd-ircu-2.10.11.04.dfsg1/config.sub
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
-timestamp='2002-03-04'
+timestamp='2006-02-23'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -21,14 +21,15 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
+
 # Please send patches to <config-patches@gnu.org>.  Submit a context
 # diff and a properly formatted ChangeLog entry.
 #
@@ -70,7 +71,7 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -83,11 +84,11 @@
 while test $# -gt 0 ; do
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
+       echo "$timestamp" ; exit ;;
     --version | -v )
-       echo "$version" ; exit 0 ;;
+       echo "$version" ; exit ;;
     --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
+       echo "$usage"; exit ;;
     -- )     # Stop option processing
        shift; break ;;
     - )	# Use stdin as input.
@@ -99,7 +100,7 @@
     *local*)
        # First pass through any local machine types.
        echo $1
-       exit 0;;
+       exit ;;
 
     * )
        break ;;
@@ -118,7 +119,9 @@
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -144,7 +147,7 @@
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis)
+	-apple | -axis | -knuth | -cray)
 		os=
 		basic_machine=$1
 		;;
@@ -169,6 +172,10 @@
 	-hiux*)
 		os=-hiuxwe2
 		;;
+	-sco6)
+		os=-sco5v6
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
 	-sco5)
 		os=-sco3.2v5
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -185,6 +192,10 @@
 		# Don't forget version if it is 3.2v4 or newer.
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
+	-sco5v6*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
 	-sco*)
 		os=-sco3.2v2
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -228,34 +239,56 @@
 	| a29k \
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+	| am33_2.0 \
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+	| bfin \
 	| c4x | clipper \
-	| d10v | d30v | dsp16xx \
-	| fr30 \
+	| d10v | d30v | dlx | dsp16xx \
+	| fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
-	| m32r | m68000 | m68k | m88k | mcore \
-	| mips | mips16 | mips64 | mips64el | mips64orion | mips64orionel \
-	| mips64vr4100 | mips64vr4100el | mips64vr4300 \
-	| mips64vr4300el | mips64vr5000 | mips64vr5000el \
-	| mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
-	| mipsisa32 \
+	| ip2k | iq2000 \
+	| m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \
+	| mips | mipsbe | mipseb | mipsel | mipsle \
+	| mips16 \
+	| mips64 | mips64el \
+	| mips64vr | mips64vrel \
+	| mips64orion | mips64orionel \
+	| mips64vr4100 | mips64vr4100el \
+	| mips64vr4300 | mips64vr4300el \
+	| mips64vr5000 | mips64vr5000el \
+	| mips64vr5900 | mips64vr5900el \
+	| mipsisa32 | mipsisa32el \
+	| mipsisa32r2 | mipsisa32r2el \
+	| mipsisa64 | mipsisa64el \
+	| mipsisa64r2 | mipsisa64r2el \
+	| mipsisa64sb1 | mipsisa64sb1el \
+	| mipsisa64sr71k | mipsisa64sr71kel \
+	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
+	| mt \
+	| msp430 \
+	| nios | nios2 \
 	| ns16k | ns32k \
-	| openrisc | or32 \
+	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| sh | sh[34] | sh[34]eb | shbe | shle | sh64 \
-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
+	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+	| sh64 | sh64le \
+	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b \
 	| strongarm \
-	| tahoe | thumb | tic80 | tron \
+	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
-	| x86 | xscale | xstormy16 | xtensa \
+	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
+	m32c)
+		basic_machine=$basic_machine-unknown
+		;;
 	m6811 | m68hc11 | m6812 | m68hc12)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
@@ -263,6 +296,9 @@
 		;;
 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
 		;;
+	ms1)
+		basic_machine=mt-unknown
+		;;
 
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
@@ -281,41 +317,64 @@
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-	| arm-*  | armbe-* | armle-* | armv*-* \
+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* \
-	| bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c54x-* \
-	| clipper-* | cydra-* \
-	| d10v-* | d30v-* \
+	| bfin-* | bs2000-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+	| clipper-* | craynv-* | cydra-* \
+	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | fx80-* \
+	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
-	| m32r-* \
+	| ip2k-* | iq2000-* \
+	| m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | mcore-* \
-	| mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
-	| mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
-	| mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* \
+	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+	| mips16-* \
+	| mips64-* | mips64el-* \
+	| mips64vr-* | mips64vrel-* \
+	| mips64orion-* | mips64orionel-* \
+	| mips64vr4100-* | mips64vr4100el-* \
+	| mips64vr4300-* | mips64vr4300el-* \
+	| mips64vr5000-* | mips64vr5000el-* \
+	| mips64vr5900-* | mips64vr5900el-* \
+	| mipsisa32-* | mipsisa32el-* \
+	| mipsisa32r2-* | mipsisa32r2el-* \
+	| mipsisa64-* | mipsisa64el-* \
+	| mipsisa64r2-* | mipsisa64r2el-* \
+	| mipsisa64sb1-* | mipsisa64sb1el-* \
+	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+	| mipstx39-* | mipstx39el-* \
+	| mmix-* \
+	| mt-* \
+	| msp430-* \
+	| nios-* | nios2-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* | sh64-* \
-	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
+	| sparclite-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+	| tahoe-* | thumb-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
-	| xtensa-* \
+	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| xstormy16-* | xtensa-* \
 	| ymp-* \
 	| z8k-*)
 		;;
+	m32c-*)
+		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
 	386bsd)
@@ -332,6 +391,9 @@
 		basic_machine=a29k-amd
 		os=-udi
 		;;
+    	abacus)
+		basic_machine=abacus-unknown
+		;;
 	adobe68k)
 		basic_machine=m68010-adobe
 		os=-scout
@@ -346,6 +408,12 @@
 		basic_machine=a29k-none
 		os=-bsd
 		;;
+	amd64)
+		basic_machine=x86_64-pc
+		;;
+	amd64-*)
+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	amdahl)
 		basic_machine=580-amdahl
 		os=-sysv
@@ -405,12 +473,27 @@
 		basic_machine=j90-cray
 		os=-unicos
 		;;
+	craynv)
+		basic_machine=craynv-cray
+		os=-unicosmp
+		;;
+	cr16c)
+		basic_machine=cr16c-unknown
+		os=-elf
+		;;
 	crds | unos)
 		basic_machine=m68k-crds
 		;;
+	crisv32 | crisv32-* | etraxfs*)
+		basic_machine=crisv32-axis
+		;;
 	cris | cris-* | etrax*)
 		basic_machine=cris-axis
 		;;
+	crx)
+		basic_machine=crx-unknown
+		os=-elf
+		;;
 	da30 | da30-*)
 		basic_machine=m68k-da30
 		;;
@@ -433,6 +516,10 @@
 		basic_machine=m88k-motorola
 		os=-sysv3
 		;;
+	djgpp)
+		basic_machine=i586-pc
+		os=-msdosdjgpp
+		;;
 	dpx20 | dpx20-*)
 		basic_machine=rs6000-bull
 		os=-bosx
@@ -611,10 +698,6 @@
 	mips3*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
 		;;
-	mmix*)
-		basic_machine=mmix-knuth
-		os=-mmixware
-		;;
 	monitor)
 		basic_machine=m68k-rom68k
 		os=-coff
@@ -627,6 +710,9 @@
 		basic_machine=i386-pc
 		os=-msdos
 		;;
+	ms1-*)
+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
@@ -702,9 +788,12 @@
 		basic_machine=hppa1.1-oki
 		os=-proelf
 		;;
-	or32 | or32-*)
+	openrisc | openrisc-*)
 		basic_machine=or32-unknown
-		os=-coff
+		;;
+	os400)
+		basic_machine=powerpc-ibm
+		os=-os400
 		;;
 	OSE68000 | ose68000)
 		basic_machine=m68000-ericsson
@@ -728,49 +817,61 @@
 	pbb)
 		basic_machine=m68k-tti
 		;;
-        pc532 | pc532-*)
+	pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
+	pc98)
+		basic_machine=i386-pc
+		;;
+	pc98-*)
+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	pentium | p5 | k5 | k6 | nexgen | viac3)
 		basic_machine=i586-pc
 		;;
-	pentiumpro | p6 | 6x86 | athlon)
+	pentiumpro | p6 | 6x86 | athlon | athlon_*)
 		basic_machine=i686-pc
 		;;
-	pentiumii | pentium2)
+	pentiumii | pentium2 | pentiumiii | pentium3)
 		basic_machine=i686-pc
 		;;
+	pentium4)
+		basic_machine=i786-pc
+		;;
 	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pentiumpro-* | p6-* | 6x86-* | athlon-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentiumii-* | pentium2-*)
+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
+	pentium4-*)
+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	pn)
 		basic_machine=pn-gould
 		;;
 	power)	basic_machine=power-ibm
 		;;
 	ppc)	basic_machine=powerpc-unknown
-	        ;;
+		;;
 	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppcle | powerpclittle | ppc-le | powerpc-little)
 		basic_machine=powerpcle-unknown
-	        ;;
+		;;
 	ppcle-* | powerpclittle-*)
 		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppc64)	basic_machine=powerpc64-unknown
-	        ;;
+		;;
 	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
 		basic_machine=powerpc64le-unknown
-	        ;;
+		;;
 	ppc64le-* | powerpc64little-*)
 		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
@@ -781,6 +882,10 @@
 		basic_machine=i586-unknown
 		os=-pw32
 		;;
+	rdos)
+		basic_machine=i386-pc
+		os=-rdos
+		;;
 	rom68k)
 		basic_machine=m68k-rom68k
 		os=-coff
@@ -801,6 +906,16 @@
 		basic_machine=a29k-amd
 		os=-udi
 		;;
+	sb1)
+		basic_machine=mipsisa64sb1-unknown
+		;;
+	sb1el)
+		basic_machine=mipsisa64sb1el-unknown
+		;;
+	sei)
+		basic_machine=mips-sei
+		os=-seiux
+		;;
 	sequent)
 		basic_machine=i386-sequent
 		;;
@@ -808,6 +923,9 @@
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
+	sh64)
+		basic_machine=sh64-unknown
+		;;
 	sparclite-wrs | simso-wrs)
 		basic_machine=sparclite-wrs
 		os=-vxworks
@@ -866,7 +984,7 @@
 	sun386 | sun386i | roadrunner)
 		basic_machine=i386-sun
 		;;
-        sv1)
+	sv1)
 		basic_machine=sv1-cray
 		os=-unicos
 		;;
@@ -874,10 +992,6 @@
 		basic_machine=i386-sequent
 		os=-dynix
 		;;
-	t3d)
-		basic_machine=alpha-cray
-		os=-unicos
-		;;
 	t3e)
 		basic_machine=alphaev5-cray
 		os=-unicos
@@ -890,6 +1004,14 @@
 		basic_machine=tic54x-unknown
 		os=-coff
 		;;
+	tic55x | c55x*)
+		basic_machine=tic55x-unknown
+		os=-coff
+		;;
+	tic6x | c6x*)
+		basic_machine=tic6x-unknown
+		os=-coff
+		;;
 	tx39)
 		basic_machine=mipstx39-unknown
 		;;
@@ -903,6 +1025,10 @@
 	tower | tower-32)
 		basic_machine=m68k-ncr
 		;;
+	tpf)
+		basic_machine=s390x-ibm
+		os=-tpf
+		;;
 	udi29k)
 		basic_machine=a29k-amd
 		os=-udi
@@ -924,8 +1050,8 @@
 		os=-vms
 		;;
 	vpp*|vx|vx-*)
-               basic_machine=f301-fujitsu
-               ;;
+		basic_machine=f301-fujitsu
+		;;
 	vxworks960)
 		basic_machine=i960-wrs
 		os=-vxworks
@@ -946,11 +1072,11 @@
 		basic_machine=hppa1.1-winbond
 		os=-proelf
 		;;
-	windows32)
-		basic_machine=i386-pc
-		os=-windows32-msvcrt
+	xbox)
+		basic_machine=i686-pc
+		os=-mingw32
 		;;
-        xps | xps100)
+	xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
 	ymp)
@@ -980,6 +1106,9 @@
 	romp)
 		basic_machine=romp-ibm
 		;;
+	mmix)
+		basic_machine=mmix-knuth
+		;;
 	rs6000)
 		basic_machine=rs6000-ibm
 		;;
@@ -996,16 +1125,13 @@
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh3 | sh4 | sh3eb | sh4eb)
+	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparc | sparcv9 | sparcv9b)
+	sparc | sparcv8 | sparcv9 | sparcv9b)
 		basic_machine=sparc-sun
 		;;
-        cydra)
+	cydra)
 		basic_machine=cydra-cydrome
 		;;
 	orion)
@@ -1020,10 +1146,6 @@
 	pmac | pmac-mpw)
 		basic_machine=powerpc-apple
 		;;
-	c4x*)
-		basic_machine=c4x-none
-		os=-coff
-		;;
 	*-unknown)
 		# Make sure to match an already-canonicalized machine name.
 		;;
@@ -1079,18 +1201,23 @@
 	      | -aos* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+	      | -openbsd* | -solidbsd* \
+	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
+	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova*)
+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+	      | -skyos* | -haiku* | -rdos*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1102,16 +1229,21 @@
 			;;
 		esac
 		;;
+	-nto-qnx*)
+		;;
 	-nto*)
-		os=-nto-qnx
+		os=`echo $os | sed -e 's|nto|nto-qnx|'`
 		;;
 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
 		;;
 	-mac*)
 		os=`echo $os | sed -e 's|mac|macos|'`
 		;;
+	-linux-dietlibc)
+		os=-linux-dietlibc
+		;;
 	-linux*)
 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
 		;;
@@ -1124,6 +1256,9 @@
 	-opened*)
 		os=-openedition
 		;;
+        -os400*)
+		os=-os400
+		;;
 	-wince*)
 		os=-wince
 		;;
@@ -1145,6 +1280,9 @@
 	-atheos*)
 		os=-atheos
 		;;
+	-syllable*)
+		os=-syllable
+		;;
 	-386bsd)
 		os=-bsd
 		;;
@@ -1155,7 +1293,7 @@
 		os=-rtmk-nova
 		;;
 	-ns2 )
-	        os=-nextstep2
+		os=-nextstep2
 		;;
 	-nsk*)
 		os=-nsk
@@ -1167,6 +1305,9 @@
 	-sinix*)
 		os=-sysv4
 		;;
+        -tpf*)
+		os=-tpf
+		;;
 	-triton*)
 		os=-sysv3
 		;;
@@ -1194,8 +1335,17 @@
 	-xenix)
 		os=-xenix
 		;;
-        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-	        os=-mint
+	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+		os=-mint
+		;;
+	-aros*)
+		os=-aros
+		;;
+	-kaos*)
+		os=-kaos
+		;;
+	-zvmoe)
+		os=-zvmoe
 		;;
 	-none)
 		;;
@@ -1228,11 +1378,14 @@
 	arm*-semi)
 		os=-aout
 		;;
+    c4x-* | tic4x-*)
+        os=-coff
+        ;;
 	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
 		;;
-        pdp11-*)
+	pdp11-*)
 		os=-none
 		;;
 	*-dec | vax-*)
@@ -1271,9 +1424,15 @@
 	*-be)
 		os=-beos
 		;;
+	*-haiku)
+		os=-haiku
+		;;
 	*-ibm)
 		os=-aix
 		;;
+    	*-knuth)
+		os=-mmixware
+		;;
 	*-wec)
 		os=-proelf
 		;;
@@ -1325,19 +1484,19 @@
 	*-next)
 		os=-nextstep3
 		;;
-        *-gould)
+	*-gould)
 		os=-sysv
 		;;
-        *-highlevel)
+	*-highlevel)
 		os=-bsd
 		;;
 	*-encore)
 		os=-bsd
 		;;
-        *-sgi)
+	*-sgi)
 		os=-irix
 		;;
-        *-siemens)
+	*-siemens)
 		os=-sysv4
 		;;
 	*-masscomp)
@@ -1406,10 +1565,16 @@
 			-mvs* | -opened*)
 				vendor=ibm
 				;;
+			-os400*)
+				vendor=ibm
+				;;
 			-ptx*)
 				vendor=sequent
 				;;
-			-vxsim* | -vxworks*)
+			-tpf*)
+				vendor=ibm
+				;;
+			-vxsim* | -vxworks* | -windiss*)
 				vendor=wrs
 				;;
 			-aux*)
@@ -1433,7 +1598,7 @@
 esac
 
 echo $basic_machine$os
-exit 0
+exit
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
--- ircd-ircu-2.10.11.04.dfsg1.orig/configure
+++ ircd-ircu-2.10.11.04.dfsg1/configure
@@ -1417,34 +1417,34 @@
   
 
 
-echo $ac_n "checking for library containing res_mkquery""... $ac_c" 1>&6
-echo "configure:1422: checking for library containing res_mkquery" >&5
-if eval "test \"`echo '$''{'ac_cv_search_res_mkquery'+set}'`\" = set"; then
+echo $ac_n "checking for library containing __res_mkquery""... $ac_c" 1>&6
+echo "configure:1422: checking for library containing __res_mkquery" >&5
+if eval "test \"`echo '$''{'ac_cv_search___res_mkquery'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_func_search_save_LIBS="$LIBS"
-ac_cv_search_res_mkquery="no"
+ac_cv_search___res_mkquery="no"
 cat > conftest.$ac_ext <<EOF
 #line 1429 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char res_mkquery();
+char __res_mkquery();
 
 int main() {
-res_mkquery()
+__res_mkquery()
 ; return 0; }
 EOF
 if { (eval echo configure:1440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  ac_cv_search_res_mkquery="none required"
+  ac_cv_search___res_mkquery="none required"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
 fi
 rm -f conftest*
-test "$ac_cv_search_res_mkquery" = "no" && for i in resolv; do
+test "$ac_cv_search___res_mkquery" = "no" && for i in resolv; do
 LIBS="-l$i  $ac_func_search_save_LIBS"
 cat > conftest.$ac_ext <<EOF
 #line 1451 "configure"
@@ -1452,15 +1452,15 @@
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char res_mkquery();
+char __res_mkquery();
 
 int main() {
-res_mkquery()
+__res_mkquery()
 ; return 0; }
 EOF
 if { (eval echo configure:1462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  ac_cv_search_res_mkquery="-l$i"
+  ac_cv_search___res_mkquery="-l$i"
 break
 else
   echo "configure: failed program was:" >&5
@@ -1471,9 +1471,9 @@
 LIBS="$ac_func_search_save_LIBS"
 fi
 
-echo "$ac_t""$ac_cv_search_res_mkquery" 1>&6
-if test "$ac_cv_search_res_mkquery" != "no"; then
-  test "$ac_cv_search_res_mkquery" = "none required" || LIBS="$ac_cv_search_res_mkquery $LIBS"
+echo "$ac_t""$ac_cv_search___res_mkquery" 1>&6
+if test "$ac_cv_search___res_mkquery" != "no"; then
+  test "$ac_cv_search___res_mkquery" = "none required" || LIBS="$ac_cv_search___res_mkquery $LIBS"
   
 else :
   { echo "configure: error: Unable to find library containing res_mkquery()" 1>&2; exit 1; }
@@ -1942,15 +1942,16 @@
 #line 1943 "configure"
 #include "confdefs.h"
 #include <stdio.h>
-int main()
+#include <sys/types.h>
+main()
 {
   FILE *f=fopen("conftestval", "w");
-  if (!f) return(1);
+  if (!f) exit(1);
   fprintf(f, "%d\n", sizeof(short));
-  return(0);
+  exit(0);
 }
 EOF
-if { (eval echo configure:1954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_short=`cat conftestval`
 else
@@ -1970,7 +1971,7 @@
 
 
 echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:1974: checking size of int" >&5
+echo "configure:1975: checking size of int" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1978,18 +1979,19 @@
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 1982 "configure"
+#line 1983 "configure"
 #include "confdefs.h"
 #include <stdio.h>
-int main()
+#include <sys/types.h>
+main()
 {
   FILE *f=fopen("conftestval", "w");
-  if (!f) return(1);
+  if (!f) exit(1);
   fprintf(f, "%d\n", sizeof(int));
-  return(0);
+  exit(0);
 }
 EOF
-if { (eval echo configure:1993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_int=`cat conftestval`
 else
@@ -2009,7 +2011,7 @@
 
 
 echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:2013: checking size of long" >&5
+echo "configure:2015: checking size of long" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2017,18 +2019,19 @@
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 2021 "configure"
+#line 2023 "configure"
 #include "confdefs.h"
 #include <stdio.h>
-int main()
+#include <sys/types.h>
+main()
 {
   FILE *f=fopen("conftestval", "w");
-  if (!f) return(1);
+  if (!f) exit(1);
   fprintf(f, "%d\n", sizeof(long));
-  return(0);
+  exit(0);
 }
 EOF
-if { (eval echo configure:2032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_long=`cat conftestval`
 else
@@ -2048,7 +2051,7 @@
 
 
 echo $ac_n "checking size of void *""... $ac_c" 1>&6
-echo "configure:2052: checking size of void *" >&5
+echo "configure:2055: checking size of void *" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_void_p'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2056,18 +2059,19 @@
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 2060 "configure"
+#line 2063 "configure"
 #include "confdefs.h"
 #include <stdio.h>
-int main()
+#include <sys/types.h>
+main()
 {
   FILE *f=fopen("conftestval", "w");
-  if (!f) return(1);
+  if (!f) exit(1);
   fprintf(f, "%d\n", sizeof(void *));
-  return(0);
+  exit(0);
 }
 EOF
-if { (eval echo configure:2071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_void_p=`cat conftestval`
 else
@@ -2088,12 +2092,12 @@
 
 if test "$ac_cv_sizeof_int" = 2 ; then
   echo $ac_n "checking for int16_t""... $ac_c" 1>&6
-echo "configure:2092: checking for int16_t" >&5
+echo "configure:2096: checking for int16_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_int16_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2097 "configure"
+#line 2101 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -2121,12 +2125,12 @@
 fi
 
   echo $ac_n "checking for u_int16_t""... $ac_c" 1>&6
-echo "configure:2125: checking for u_int16_t" >&5
+echo "configure:2129: checking for u_int16_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_u_int16_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2130 "configure"
+#line 2134 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -2155,12 +2159,12 @@
 
 elif test "$ac_cv_sizeof_short" = 2 ; then
   echo $ac_n "checking for int16_t""... $ac_c" 1>&6
-echo "configure:2159: checking for int16_t" >&5
+echo "configure:2163: checking for int16_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_int16_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2164 "configure"
+#line 2168 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -2188,12 +2192,12 @@
 fi
 
   echo $ac_n "checking for u_int16_t""... $ac_c" 1>&6
-echo "configure:2192: checking for u_int16_t" >&5
+echo "configure:2196: checking for u_int16_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_u_int16_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2197 "configure"
+#line 2201 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -2225,12 +2229,12 @@
 fi
 if test "$ac_cv_sizeof_int" = 4 ; then
   echo $ac_n "checking for int32_t""... $ac_c" 1>&6
-echo "configure:2229: checking for int32_t" >&5
+echo "configure:2233: checking for int32_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_int32_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2234 "configure"
+#line 2238 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -2258,12 +2262,12 @@
 fi
 
   echo $ac_n "checking for u_int32_t""... $ac_c" 1>&6
-echo "configure:2262: checking for u_int32_t" >&5
+echo "configure:2266: checking for u_int32_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_u_int32_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2267 "configure"
+#line 2271 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -2292,12 +2296,12 @@
 
 elif test "$ac_cv_sizeof_short" = 4 ; then
   echo $ac_n "checking for int32_t""... $ac_c" 1>&6
-echo "configure:2296: checking for int32_t" >&5
+echo "configure:2300: checking for int32_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_int32_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2301 "configure"
+#line 2305 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -2325,12 +2329,12 @@
 fi
 
   echo $ac_n "checking for u_int32_t""... $ac_c" 1>&6
-echo "configure:2329: checking for u_int32_t" >&5
+echo "configure:2333: checking for u_int32_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_u_int32_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2334 "configure"
+#line 2338 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -2359,12 +2363,12 @@
 
 elif test "$ac_cv_sizeof_long" = 4 ; then
   echo $ac_n "checking for int32_t""... $ac_c" 1>&6
-echo "configure:2363: checking for int32_t" >&5
+echo "configure:2367: checking for int32_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_int32_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2368 "configure"
+#line 2372 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -2392,12 +2396,12 @@
 fi
 
   echo $ac_n "checking for u_int32_t""... $ac_c" 1>&6
-echo "configure:2396: checking for u_int32_t" >&5
+echo "configure:2400: checking for u_int32_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_u_int32_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2401 "configure"
+#line 2405 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -2431,12 +2435,12 @@
 for ac_func in kqueue setrlimit getrusage times
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2435: checking for $ac_func" >&5
+echo "configure:2439: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2440 "configure"
+#line 2444 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2459,7 +2463,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2485,7 +2489,7 @@
 
 
 echo $ac_n "checking for restartable system calls""... $ac_c" 1>&6
-echo "configure:2489: checking for restartable system calls" >&5
+echo "configure:2493: checking for restartable system calls" >&5
 if eval "test \"`echo '$''{'ac_cv_sys_restartable_syscalls'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2493,7 +2497,7 @@
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 2497 "configure"
+#line 2501 "configure"
 #include "confdefs.h"
 /* Exit 0 (true) if wait returns something other than -1,
    i.e. the pid of the child, which means that wait was restarted
@@ -2511,7 +2515,7 @@
 }
 
 EOF
-if { (eval echo configure:2515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sys_restartable_syscalls=yes
 else
@@ -2535,15 +2539,15 @@
 
 
 echo $ac_n "checking for donuts""... $ac_c" 1>&6
-echo "configure:2539: checking for donuts" >&5
+echo "configure:2543: checking for donuts" >&5
 echo "$ac_t""yes" 1>&6
 
-for ac_prog in gawk mawk nawk awk
+for ac_prog in mawk gawk nawk awk
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2547: checking for $ac_word" >&5
+echo "configure:2551: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2573,7 +2577,7 @@
 done
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:2577: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:2581: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2611,7 +2615,7 @@
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:2615: checking for a BSD compatible install" >&5
+echo "configure:2619: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2664,7 +2668,7 @@
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:2668: checking whether ln -s works" >&5
+echo "configure:2672: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2689,7 +2693,7 @@
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2693: checking for $ac_word" >&5
+echo "configure:2697: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_RMPROG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2730,7 +2734,7 @@
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2734: checking for $ac_word" >&5
+echo "configure:2738: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_SHPROG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2768,7 +2772,7 @@
 
 
 echo $ac_n "checking for posix non-blocking""... $ac_c" 1>&6
-echo "configure:2772: checking for posix non-blocking" >&5
+echo "configure:2776: checking for posix non-blocking" >&5
 if eval "test \"`echo '$''{'unet_cv_sys_nonblocking_posix'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2776,7 +2780,7 @@
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 2780 "configure"
+#line 2784 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -2802,7 +2806,7 @@
   exit(1);
 }
 EOF
-if { (eval echo configure:2806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   unet_cv_sys_nonblocking_posix=yes
 else
@@ -2824,7 +2828,7 @@
 
 else
 echo $ac_n "checking for bsd non-blocking""... $ac_c" 1>&6
-echo "configure:2828: checking for bsd non-blocking" >&5
+echo "configure:2832: checking for bsd non-blocking" >&5
 if eval "test \"`echo '$''{'unet_cv_sys_nonblocking_bsd'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2832,7 +2836,7 @@
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 2836 "configure"
+#line 2840 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -2858,7 +2862,7 @@
   exit(1);
 }
 EOF
-if { (eval echo configure:2862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   unet_cv_sys_nonblocking_bsd=yes
 else
@@ -2886,19 +2890,19 @@
 fi
 fi
 echo $ac_n "checking for posix signals""... $ac_c" 1>&6
-echo "configure:2890: checking for posix signals" >&5
+echo "configure:2894: checking for posix signals" >&5
 if eval "test \"`echo '$''{'unet_cv_sys_signal_posix'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2895 "configure"
+#line 2899 "configure"
 #include "confdefs.h"
 #include <signal.h>
 int main() {
 sigaction(SIGTERM, (struct sigaction *)0L, (struct sigaction *)0L)
 ; return 0; }
 EOF
-if { (eval echo configure:2902: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2906: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   unet_cv_sys_signal_posix=yes
 else
@@ -2918,7 +2922,7 @@
 
 else
 echo $ac_n "checking for bsd reliable signals""... $ac_c" 1>&6
-echo "configure:2922: checking for bsd reliable signals" >&5
+echo "configure:2926: checking for bsd reliable signals" >&5
 if eval "test \"`echo '$''{'unet_cv_sys_signal_bsd'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2926,7 +2930,7 @@
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 2930 "configure"
+#line 2934 "configure"
 #include "confdefs.h"
 #include <signal.h>
 int calls = 0;
@@ -2944,7 +2948,7 @@
   exit (0);
 }
 EOF
-if { (eval echo configure:2948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   unet_cv_sys_signal_bsd=yes
 else
@@ -2973,20 +2977,20 @@
 fi
 
 echo $ac_n "checking if the compiler understands -pipe""... $ac_c" 1>&6
-echo "configure:2977: checking if the compiler understands -pipe" >&5
+echo "configure:2981: checking if the compiler understands -pipe" >&5
 unet_cv_pipe_flags="$ac_cv_prog_gcc"
 if test "$ac_cv_prog_gcc" = no; then
   OLDCFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -pipe"
   cat > conftest.$ac_ext <<EOF
-#line 2983 "configure"
+#line 2987 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2990: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2994: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   unet_cv_pipe_flags=yes
 else
@@ -3006,7 +3010,7 @@
 
 
 echo $ac_n "checking for OS-dependent information""... $ac_c" 1>&6
-echo "configure:3010: checking for OS-dependent information" >&5
+echo "configure:3014: checking for OS-dependent information" >&5
 case "$host" in
     *-linux*)
 	echo "$ac_t""Linux ($host) found." 1>&6
@@ -3066,7 +3070,7 @@
 
 
 echo $ac_n "checking whether to enable use of poll()""... $ac_c" 1>&6
-echo "configure:3070: checking whether to enable use of poll()" >&5
+echo "configure:3074: checking whether to enable use of poll()" >&5
 # Check whether --enable-poll or --disable-poll was given.
 if test "${enable_poll+set}" = set; then
   enableval="$enable_poll"
@@ -3100,7 +3104,7 @@
 
 
 echo $ac_n "checking whether to enable debug mode""... $ac_c" 1>&6
-echo "configure:3104: checking whether to enable debug mode" >&5
+echo "configure:3108: checking whether to enable debug mode" >&5
 # Check whether --enable-debug or --disable-debug was given.
 if test "${enable_debug+set}" = set; then
   enableval="$enable_debug"
@@ -3124,7 +3128,7 @@
 fi
 
 echo $ac_n "checking whether to enable asserts""... $ac_c" 1>&6
-echo "configure:3128: checking whether to enable asserts" >&5
+echo "configure:3132: checking whether to enable asserts" >&5
 # Check whether --enable-asserts or --disable-asserts was given.
 if test "${enable_asserts+set}" = set; then
   enableval="$enable_asserts"
@@ -3148,7 +3152,7 @@
 fi
 
 echo $ac_n "checking whether to enable debugging symbols""... $ac_c" 1>&6
-echo "configure:3152: checking whether to enable debugging symbols" >&5
+echo "configure:3156: checking whether to enable debugging symbols" >&5
 # Check whether --enable-symbols or --disable-symbols was given.
 if test "${enable_symbols+set}" = set; then
   enableval="$enable_symbols"
@@ -3169,7 +3173,7 @@
 fi
 
 echo $ac_n "checking whether to enable profiling support (gprof)""... $ac_c" 1>&6
-echo "configure:3173: checking whether to enable profiling support (gprof)" >&5
+echo "configure:3177: checking whether to enable profiling support (gprof)" >&5
 # Check whether --enable-profile or --disable-profile was given.
 if test "${enable_profile+set}" = set; then
   enableval="$enable_profile"
@@ -3190,7 +3194,7 @@
 fi
 
 echo $ac_n "checking whether to enable pedantic compiler warnings""... $ac_c" 1>&6
-echo "configure:3194: checking whether to enable pedantic compiler warnings" >&5
+echo "configure:3198: checking whether to enable pedantic compiler warnings" >&5
 # Check whether --enable-pedantic or --disable-pedantic was given.
 if test "${enable_pedantic+set}" = set; then
   enableval="$enable_pedantic"
@@ -3211,7 +3215,7 @@
 fi
 
 echo $ac_n "checking whether to enable compiler warnings""... $ac_c" 1>&6
-echo "configure:3215: checking whether to enable compiler warnings" >&5
+echo "configure:3219: checking whether to enable compiler warnings" >&5
 # Check whether --enable-warnings or --disable-warnings was given.
 if test "${enable_warnings+set}" = set; then
   enableval="$enable_warnings"
@@ -3232,7 +3236,7 @@
 fi
 
 echo $ac_n "checking whether to enable inlining for a few critical functions""... $ac_c" 1>&6
-echo "configure:3236: checking whether to enable inlining for a few critical functions" >&5
+echo "configure:3240: checking whether to enable inlining for a few critical functions" >&5
 # Check whether --enable-inlines or --disable-inlines was given.
 if test "${enable_inlines+set}" = set; then
   enableval="$enable_inlines"
@@ -3256,7 +3260,7 @@
 fi
 
 echo $ac_n "checking whether to enable the /dev/poll event engine""... $ac_c" 1>&6
-echo "configure:3260: checking whether to enable the /dev/poll event engine" >&5
+echo "configure:3264: checking whether to enable the /dev/poll event engine" >&5
 # Check whether --enable-devpoll or --disable-devpoll was given.
 if test "${enable_devpoll+set}" = set; then
   enableval="$enable_devpoll"
@@ -3286,7 +3290,7 @@
 fi
 
 echo $ac_n "checking whether to enable the kqueue event engine""... $ac_c" 1>&6
-echo "configure:3290: checking whether to enable the kqueue event engine" >&5
+echo "configure:3294: checking whether to enable the kqueue event engine" >&5
 # Check whether --enable-kqueue or --disable-kqueue was given.
 if test "${enable_kqueue+set}" = set; then
   enableval="$enable_kqueue"
@@ -3316,7 +3320,7 @@
 fi
 
 echo $ac_n "checking what name to give the symlink""... $ac_c" 1>&6
-echo "configure:3320: checking what name to give the symlink" >&5
+echo "configure:3324: checking what name to give the symlink" >&5
 # Check whether --with-symlink or --without-symlink was given.
 if test "${with_symlink+set}" = set; then
   withval="$with_symlink"
@@ -3348,7 +3352,7 @@
 
 
 echo $ac_n "checking what permissions to set on the installed binary""... $ac_c" 1>&6
-echo "configure:3352: checking what permissions to set on the installed binary" >&5
+echo "configure:3356: checking what permissions to set on the installed binary" >&5
 # Check whether --with-mode or --without-mode was given.
 if test "${with_mode+set}" = set; then
   withval="$with_mode"
@@ -3374,7 +3378,7 @@
 
 unet_uid=`id | sed -e 's/.*uid=[0-9]*(//' -e 's/).*//' 2> /dev/null`
 echo $ac_n "checking which user should own the installed binary""... $ac_c" 1>&6
-echo "configure:3378: checking which user should own the installed binary" >&5
+echo "configure:3382: checking which user should own the installed binary" >&5
 # Check whether --with-owner or --without-owner was given.
 if test "${with_owner+set}" = set; then
   withval="$with_owner"
@@ -3400,7 +3404,7 @@
 
 unet_gid=`id | sed -e 's/.*gid=[0-9]*(//' -e 's/).*//' 2> /dev/null`
 echo $ac_n "checking which group should own the installed binary""... $ac_c" 1>&6
-echo "configure:3404: checking which group should own the installed binary" >&5
+echo "configure:3408: checking which group should own the installed binary" >&5
 # Check whether --with-group or --without-group was given.
 if test "${with_group+set}" = set; then
   withval="$with_group"
@@ -3432,7 +3436,7 @@
     fi
 fi
 echo $ac_n "checking for site domain name""... $ac_c" 1>&6
-echo "configure:3436: checking for site domain name" >&5
+echo "configure:3440: checking for site domain name" >&5
 # Check whether --with-domain or --without-domain was given.
 if test "${with_domain+set}" = set; then
   withval="$with_domain"
@@ -3462,7 +3466,7 @@
 
 
 echo $ac_n "checking if chroot operation is desired""... $ac_c" 1>&6
-echo "configure:3466: checking if chroot operation is desired" >&5
+echo "configure:3470: checking if chroot operation is desired" >&5
 # Check whether --with-chroot or --without-chroot was given.
 if test "${with_chroot+set}" = set; then
   withval="$with_chroot"
@@ -3510,7 +3514,7 @@
 exec_prefix=$unet_save_exec_prefix
 
 echo $ac_n "checking where the binary will be for /restart""... $ac_c" 1>&6
-echo "configure:3514: checking where the binary will be for /restart" >&5
+echo "configure:3518: checking where the binary will be for /restart" >&5
 if test x"$unet_cv_with_symlink" = xno; then
     unet_spath="$unet_bindir/ircd"
 else
@@ -3532,7 +3536,7 @@
 
 
 echo $ac_n "checking what the data directory should be""... $ac_c" 1>&6
-echo "configure:3536: checking what the data directory should be" >&5
+echo "configure:3540: checking what the data directory should be" >&5
 # Check whether --with-dpath or --without-dpath was given.
 if test "${with_dpath+set}" = set; then
   withval="$with_dpath"
@@ -3575,7 +3579,7 @@
 
 
 echo $ac_n "checking where the default configuration file resides""... $ac_c" 1>&6
-echo "configure:3579: checking where the default configuration file resides" >&5
+echo "configure:3583: checking where the default configuration file resides" >&5
 # Check whether --with-cpath or --without-cpath was given.
 if test "${with_cpath+set}" = set; then
   withval="$with_cpath"
@@ -3617,7 +3621,7 @@
 
 
 echo $ac_n "checking where to put the debugging log if debugging enabled""... $ac_c" 1>&6
-echo "configure:3621: checking where to put the debugging log if debugging enabled" >&5
+echo "configure:3625: checking where to put the debugging log if debugging enabled" >&5
 # Check whether --with-lpath or --without-lpath was given.
 if test "${with_lpath+set}" = set; then
   withval="$with_lpath"
@@ -3663,7 +3667,7 @@
 unet_maxcon=`ulimit -Hn`
 unet_maxcon=`expr $unet_maxcon - 4`
 echo $ac_n "checking max connections""... $ac_c" 1>&6
-echo "configure:3667: checking max connections" >&5
+echo "configure:3671: checking max connections" >&5
 # Check whether --with-maxcon or --without-maxcon was given.
 if test "${with_maxcon+set}" = set; then
   withval="$with_maxcon"
--- ircd-ircu-2.10.11.04.dfsg1.orig/configure.in
+++ ircd-ircu-2.10.11.04.dfsg1/configure.in
@@ -108,7 +108,7 @@
 
 dnl Look for res_mkquery.  Done after AC_LIBRARY_NET in case res_mkquery
 dnl is in one of those libraries somewhere.
-AC_SEARCH_LIBS(res_mkquery, resolv, ,
+AC_SEARCH_LIBS(__res_mkquery, resolv, ,
 [AC_MSG_ERROR([Unable to find library containing res_mkquery()])])
 
 dnl Checks for header files.
--- ircd-ircu-2.10.11.04.dfsg1.orig/debian/dirs
+++ ircd-ircu-2.10.11.04.dfsg1/debian/dirs
@@ -0,0 +1,4 @@
+usr/sbin
+etc/ircd
+var/log/ircd
+var/run/ircd
--- ircd-ircu-2.10.11.04.dfsg1.orig/debian/init
+++ ircd-ircu-2.10.11.04.dfsg1/debian/init
@@ -0,0 +1,43 @@
+#!/bin/sh
+#
+# Starts/stops the irc daemon
+#
+
+# $PATH to go
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+          
+# where the irc-daemon is
+IRCD=/usr/sbin/ircd-ircu
+PIDFILE=/var/run/ircd/ircd.pid                  
+
+if [ -x "$IRCD" ]; then
+  case "$1" in
+          start)
+                  echo -n "Starting irc server daemon:"
+                  echo -n " ircd-ircu"
+                  start-stop-daemon --start --quiet --pidfile ${PIDFILE} --chuid irc --exec ${IRCD}
+                  echo "."
+                  ;;
+        
+          stop)
+                  echo -n "Stopping irc server daemon:"
+                  echo -n " ircd-ircu"
+                  start-stop-daemon --stop --quiet --oknodo --pidfile ${PIDFILE} --exec ${IRCD}
+                  echo "."  
+                  ;;
+        
+          restart|force-reload)
+                  echo -n "Restarting irc server daemon:"
+                  echo -n " ircd-ircu"
+                  start-stop-daemon --stop --quiet --oknodo --pidfile ${PIDFILE} --exec ${IRCD}
+                  start-stop-daemon --start --quiet --pidfile ${PIDFILE} --chuid irc --exec ${IRCD}
+                  echo "."
+                  ;;
+          *)
+                  echo "Usage: $0 {start|stop|restart|force-reload}"
+                  exit 1
+                  ;;
+  esac
+fi
+
+exit 0
--- ircd-ircu-2.10.11.04.dfsg1.orig/debian/postrm
+++ ircd-ircu-2.10.11.04.dfsg1/debian/postrm
@@ -0,0 +1,26 @@
+#!/bin/sh -e
+
+if [ "$1" = "purge" ]; then
+  if [ -d "/etc/ircd" ]; then
+    rm -rf /etc/ircd/*
+    rmdir --ignore-fail-on-non-empty /etc/ircd
+  fi
+fi
+
+if [ "$1" = "purge" ]; then
+  if [ -d "/var/log/ircd" ]; then
+    rm -rf /var/log/ircd/*
+    rmdir --ignore-fail-on-non-empty /var/log/ircd
+  fi
+fi
+
+if [ "$1" = "purge" ]; then
+  if [ -d "/var/run/ircd" ]; then
+    rm -rf /var/run/ircd/*
+    rmdir --ignore-fail-on-non-empty /var/run/ircd
+  fi
+fi
+
+#DEBHELPER#
+
+exit 0
--- ircd-ircu-2.10.11.04.dfsg1.orig/debian/copyright
+++ ircd-ircu-2.10.11.04.dfsg1/debian/copyright
@@ -0,0 +1,90 @@
+Package History:
+
+1996 - 1997: Christoph Lameter <clameter@waterf.org>
+1997 - 2002: Johnie Ingram <johnie@netgod.net>
+Since 2002: Martin Loschwitz <madkiss@madkiss.org>
+
+Actual versions from ircu can be found at http://coder-com.undernet.org/
+
+Copyright:
+
+ *   This program 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 Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+IRC was conceived of and written by Jarkko Oikarinen <jto@tolsun.oulu.fi>.
+IRC was originally written in University of Oulu, Computing Center.
+Jan 1991 - IRC 2.6  jto@tolsun.oulu.fi
+         - Multiple Channels and protocol changes
+
+This product includes software developed by the University of
+California, Berkley and its contributors.
+
+ * Copyright (c) 1985, 1989 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted provided
+ * that: (1) source distributions retain this entire copyright notice and
+ * comment, and (2) distributions including binaries display the following
+ * acknowledgement:  ``This product includes software developed by the
+ * University of California, Berkeley and its contributors'' in the
+ * documentation or other materials provided with the distribution and in
+ * all advertising materials mentioning features or use of this software.
+ * Neither the name of the University nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+
+
+This product contains modifications developed by the Linux Internet
+Support Cooperative and Open Projects Net for the operation of OPN's
+IRC network.
+
+
+  WARRANTY: If you cast a giant bronze tablet and inscribe the source
+  code for this irc daemon on it, you can use it for a doorstop, subject
+  to the following limitations:
+
+  (1) If you lift it I won't be responsible for hernias or other
+      damage.
+
+  (2) If you kick it I won't be responsible for damage to your foot.
+
+  (3) If you do anything else with it I won't be responsible for
+      intended or unintended damage, or any other intended or
+      unintended results.
+
+  No other use of this program is warranted in any way.  No other
+  warranty, express or implied, is provided for this program.  If any
+  part of this license is invalidated in your jurisdiction, we can't
+  be held responsible but we'll try to figure out what to do next.
+  Your use of this program constitutes consent to these conditions.
+
+  Please send any patches you make to support@openprojects.net, or to
+  me at levin@openprojects.net!  Please don't assume this will always
+  be my net address.  Please don't eat the daisies.
+
+  :) lilo
+
+Modifications for Debian are copyright (C) 1996-1997 Christoph
+Lameter, (C) 1997-1999 Johnie Ingram, and also released under the
+terms of the GPL -- version 2, or any later version.
+
+From 2002 on, all modifications for the debian package are (C) Martin
+Loschwitz.
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
--- ircd-ircu-2.10.11.04.dfsg1.orig/debian/changelog
+++ ircd-ircu-2.10.11.04.dfsg1/debian/changelog
@@ -0,0 +1,443 @@
+ircd-ircu (2.10.11.04.dfsg1-0.2ubuntu1) feisty; urgency=low
+
+  * Rebuild for ldbl128 change (powerpc, sparc).
+  * Set Ubuntu maintainer address.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu,  1 Mar 2007 22:39:50 +0000
+
+ircd-ircu (2.10.11.04.dfsg1-0.2) unstable; urgency=low
+
+  * NMU.
+  * Fix configure.in to make it build on amd64 (Closes: #254165)
+  * Regenerate configure script.
+
+ -- Frederik Schüler <fs@debian.org>  Fri,  2 Jun 2006 21:46:55 +0000
+
+ircd-ircu (2.10.11.04.dfsg1-0.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Rerepackage upstream tarball without RFC (Closes: #365195)
+  * Update FSF address
+  * Convert changelog to UTF-8
+
+ -- Julien Danjou <acid@debian.org>  Fri,  2 Jun 2006 15:14:47 +0200
+
+ircd-ircu (2.10.11.04-3) unstable; urgency=low
+
+  * debian/preinst: Made it look a bit nicer
+  * debian/patches/02_s390_alpha_fix.dpatch: Fix FTBFS on s390 and alpha
+
+ -- Martin Loschwitz <madkiss@debian.org>  Sat, 23 Feb 2003 14:49:00 +0100
+ 
+ircd-ircu (2.10.11.04-2) unstable; urgency=low
+  
+  * debian/control: Add missing build dependency for dpatch
+
+ -- Martin Loschwitz <madkiss@madkiss.org>  Wed, 26 Feb 2003 13:54:00 +0100
+
+ircd-ircu (2.10.11.04-1) unstable; urgency=low
+  
+  * debian/changelog: New upstream version
+  * debian/control: Updated Standards-Version
+  * debian/control: Changed Maintainer E-Mail address
+  * debian/control: Build-Depend on dpatch
+  * debian/control: Remove gcc-3.2 specific stuff
+  * debian/rules: Fix noopt rules
+  * debian/rules: Use the files from dpatch package
+  * debian/rules: Increased DH_COMPAT to 4
+  * debian/rules: Some other small cleanups
+
+ -- Martin Loschwitz <madkiss@debian.org>  Thu, 25 Feb 2002 19:00:00 +0100
+ 
+ircd-ircu (2.10.11.02+cvs.20021101-1) unstable; urgency=low
+
+  * debian/rules: We use dpatch to handle patches now
+  * debian/rules: Use gcc-3.2 as standard
+  * debian/control: Added build-dependency for gcc-3.2
+  * debian/changelog: New upstream version
+  * debian/control: renamed package to ircd-ircu (Closes: #166644)
+  * debian/control: Updated Standards-Version
+  * debian/config: removed debconf-note
+  * debian/rules: different cleanups
+  * debian/{postinst,preinst} removed
+  * various other changes and updates
+  * fixed some more errors found by Gergely Nagy
+
+ -- Martin Loschwitz <madkiss@madkiss.org>  Fri, 01 Nov 2002 10:53:00 +0100
+       
+ircd (2.10.10.pl18-4) unstable; urgency=high
+
+  * Removed Conflicts: and added Replaces: to debian/rules 
+  * Removed irc.1.gz (Closes: #144549)
+  * Changed init-file to check for ircd-binary.
+
+ -- Martin Loschwitz <madkiss@madkiss.org>  Fri, 26 Apr 2002 20:15:00 +0200
+   
+ircd (2.10.10.pl18-3) unstable; urgency=high
+
+  * Added Conflicts: for ircd-dalnet (Closes: #144549)
+ 
+ -- Martin Loschwitz <madkiss@madkiss.org>  Fri, 26 Apr 2002 16:05:00 +0200
+     
+ircd (2.10.10.pl18-2) unstable; urgency=medium
+
+  * Added debconf note about dancer-ircd
+  * Package is ready for woody now (Closes: #143794)
+
+ -- Martin Loschwitz <madkiss@madkiss.org>  Thu, 21 Apr 2002 19:40:00 +0200
+ 
+ircd (2.10.10.pl18-1) unstable; urgency=low
+
+  * New Maintainer
+  * Removed dancer-ircd from package (Closes: #141241)
+  * Repackaging (Closes: #84567, #121042, #121041, #63280, #61336)
+  * new upstream version (Closes: #128180, #142353, #58757)
+
+ -- Martin Loschwitz <madkiss@madkiss.org>  Thu, 13 Apr 2002 10:29:00 +0200
+   
+ircd (2.10.07-1.1) unstable; urgency=low
+  * Non-maintainer upload.
+  * Fix printf-is-a-macro issue (gcc 3.0).  Closes: #103152
+
+ -- LaMont Jones <lamont@debian.org>  Mon,  9 Jul 2001 21:39:34 -0600
+
+ircd (2.10.07-1) unstable; urgency=low
+
+  * New upstream version.
+  * Removed setgidness, closes: #37103, #42939, #52763.
+  * Fixed inability to install if /etc/ircd doesn't exist, closes: #52327.
+
+ -- Johnie Ingram <johnie@debian.org>  Fri, 17 Dec 1999 19:19:02 -0600
+
+ircd (2.10.06-2) unstable; urgency=low
+
+  * Really fix sgidness, closes: #37103, #42939.  Hi Ian.
+
+ -- Johnie Ingram <johnie@debian.org>  Tue, 14 Sep 1999 13:37:53 -0500
+
+ircd (2.10.06-1) unstable; urgency=low
+
+  * New upstream version.
+  * Updated to Standards-Version 3.0.1.0
+  * Broke linpeople patches down further, added support for a local
+    ircd.conf file and shorter resolve timeout.
+  * ircd is no longer sgid root, closes: #37103, #42939.
+  * dancerconfig no longer tries to chown and chgrp, closes: #42232.
+
+ -- Johnie Ingram <johnie@debian.org>  Tue, 14 Sep 1999 12:58:39 -0500
+
+ircd (2.10.05-4) unstable; urgency=low
+
+  * Changed CHANNELLEN in dancer from 200 to 60 to match network policy.
+  * Removed typo in postint, again closes: #36382, #36428.
+
+ -- Johnie Ingram <johnie@debian.org>  Wed, 28 Apr 1999 04:34:17 -0400
+
+ircd (2.10.05-3) unstable; urgency=low
+
+  * Fixed sed in postinst with perl magic from Roderick Schertler, closes:
+    #36382, #36428.
+
+ -- Johnie Ingram <johnie@debian.org>  Tue, 27 Apr 1999 11:33:06 -0400
+
+ircd (2.10.05-2) unstable; urgency=low
+
+  * Moved socket in default conf from /tmp to /var/run, closes: #35243.
+  * Added internal target for building libc5 dancer binary.
+
+ -- Johnie Ingram <johnie@debian.org>  Mon, 12 Apr 1999 06:25:27 -0400
+
+ircd (2.10.05-1) unstable; urgency=low
+
+  * New upstream version (2.10.05.18.(ipcheck4-5)).
+  * Updated config file to add separate port (8005) for server-only
+    connects, closes: #32845.
+  * Fixed docs in default MOTD, and made it world-readable, closes:
+    #34347.
+
+ -- Johnie Ingram <johnie@debian.org>  Sun, 21 Mar 1999 17:22:00 -0500
+
+ircd (2.10.04+-3) unstable; urgency=low
+
+  * Fixed SPATH for dancer, closes: #32760.
+  * New upstream version (CVS), closes: #31775, #30504.  
+
+ -- Johnie Ingram <johnie@debian.org>  Thu,  4 Feb 1999 13:26:15 -0500
+
+ircd (2.10.04+-2) unstable; urgency=low
+
+  * New upstream version (CVS), closes: #31775, #30504.
+  * Lets see of this works shall we ----^
+
+ -- Johnie Ingram <johnie@debian.org>  Sun, 31 Jan 1999 14:55:24 -0500
+
+ircd (2.10.04+-1) unstable; urgency=low
+
+  * Used -r for directory delete in postrm (#31775).
+  * New upstream version ircu2.10.04+.resolv7-9.nodns.egcs.config17-18.nmt.doc6-7.msgflags2-3.chroot1-2.egcs1-2.nip.tok.pten.tlim2-3.illegal.tlim3-4.admin.admin1-2.upper3-4.upper4-5.whisper2-3.egcs2-3.egcs3-4.ipcheck.cpp.cpp1-2.acr1.ipcheck1-2.gipl.masks.full.config18-19.modeless5-7.fdsetsize.doc7-8.url.cpp2-3.collapse.space.hashv.findname.findnickserver.inthashnick.nousertarget.findmatchserver.netbsd.hashv1-2.config19-20.common.isperson.config20-21.naming.cpp3-4.bursthack2.modeless7-8.charattribs.newcommon.tolower.toupper.ctype.match1.mycmp.newcollapse.matchexec.newhash.mmexec.newcollapse1-2.matchexec1-2.usernames.newhash1-2.nickjupes2.match1-2.settime3-4.newcommon1-3.forceinline.newcommon3-5.newcommon5-6.usernames1-2.forceinline1-2.getshort.tlim4-5.misc2-3.forceinline2-3.dead2-3.config21-22.nomotd.kcq.rpl272.findnuser.nnn.matchcompip (CVS).
+  * Removed possible bashism in postrm.
+  * For dancer: added patch, changed compiler to gcc and removed -pipe
+    from CFLAGS for Solaris compatibility.
+
+ -- Johnie Ingram <johnie@debian.org>  Sun, 31 Jan 1999 04:59:09 -0500
+
+ircd (2.10.04-4) unstable; urgency=low
+
+  * Eliminated duplication of file TODO (#28820) by removing both files.
+  * Changed location of pid file so ircd can write to it (#28857).
+  * Fixed in previous versions: changes /etc/services (#28821), missing
+    manpage (#28857), segfault on /admin (30504, kept open for
+    documentation until slink release).
+
+ -- Johnie Ingram <johnie@debian.org>  Sat, 19 Dec 1998 23:54:19 -0500
+
+ircd (2.10.04-3) unstable; urgency=low
+
+  * Updated to Standards-Version 2.5.0.0.
+  * Added expanded T-line syntax to dancer -- it can match either the
+    client host or the servers virtual interface IP.  Inside the MOTD, a ^
+    at a line start means PRIVMSG and > means NOTICE.
+
+ -- Johnie Ingram <johnie@debian.org>  Sun, 29 Nov 1998 22:07:30 -0500
+
+ircd (2.10.04-2) unstable; urgency=low
+
+  * Configured for correct SPATH (#28057).
+  * Installed correct manpage (ircd.8, not irc.1) and remote.motd
+    (#27985). 
+
+ -- Johnie Ingram <johnie@debian.org>  Tue, 13 Oct 1998 14:31:36 -0400
+
+ircd (2.10.04-1) unstable; urgency=low
+
+  * Logfiles are removed when ircd is purged (#27339).
+  * New upstream version (CVS): ircu2.10.04+.resolv7-9.nodns.egcs.
+  config17-18.nmt.doc6-7.msgflags2-3.chroot1-2.egcs1-2.nip.tok.pten.
+  tlim2-3.illegal.tlim3-4.admin.admin1-2.upper3-4.upper4-5.whisper2-3.
+  egcs2-3.egcs3-4.ipcheck.cpp.cpp1-2.acr1.ipcheck1-2.gipl.masks.full.
+  config18-19.modeless5-7.fdsetsize.
+  * Improved debhelperization in debian/rules file.
+  * Updated to Standards-Version 2.4.1.4.
+  * Beta linpeople patches removed (web interface, zlib compression).  
+  * Closes #23951, a resubmission of #19684: postinst doesn't check for
+    errors.
+  * Updated documentation.
+
+ -- Johnie Ingram <johnie@debian.org>  Tue, 13 Oct 1998 13:52:04 -0400
+
+ircd (2.10.03-8) unstable; urgency=low
+
+  * Added tweak from veneficus to fix bitchx /notify function.
+
+ -- Johnie Ingram <johnie@debian.org>  Fri, 31 Jul 1998 23:00:08 -0400
+
+ircd (2.10.03-7) unstable; urgency=low
+
+  * Updated to .dead.whox.dead1-2.oprem.whox1-2.zombie.
+  * Added moderated channel feature suggested by Teknix and lilo
+    for the IRC forum with Eric S. Raymond (joins and parts are not seen,
+    nick changes are restricted).
+  * Fixed bug in services patch where chanops were not always accorded
+    chanop privileges.
+  * Activated beta version of -DWEB_INTERFACE 
+
+ -- Johnie Ingram <johnie@debian.org>  Sat,  9 May 1998 10:09:32 -0400
+
+ircd (2.10.03-6) unstable; urgency=low
+
+  * Restored debian changelog.
+
+ -- Johnie Ingram <johnie@debian.org>  Thu,  7 May 1998 15:51:39 -0400
+
+ircd (2.10.03-5) frozen unstable; urgency=low
+
+  * Fixed typo in postinst file that could cause it to fail if debian/tmp
+    was not in the current directory.  :-)
+
+ -- Johnie Ingram <johnie@debian.org>  Thu,  7 May 1998 12:17:15 -0400
+
+ircd (2.10.03-4) frozen unstable; urgency=low, closes=21748 19684
+
+  * Updated to .dead.whox.dead1-2.oprem.whox1-2.
+  * Rewrote services.hack and gline.hack to fix outstanding dancer bugs.
+  * Install script uses adduser --system to create missing irc user
+    (grave Bug #21748).
+  * Closes important Bug #19684, postinst doesn't check for errors.
+  * In the dancer binary used at irc.debian.org:
+      * services patch no longer treats ircops as servers.
+      * GLINE and server-set TOPIC commands now work correctly.
+  * Also fixed since 2.10.02-1: 18169, 19577, 19613, 19684, 18169; see
+    also dancer bugfixes in 2.10.03-1 changelog entry.
+  * Updated to Standards-Version 2.4.1.0.
+
+ -- Johnie Ingram <johnie@debian.org>  Thu,  7 May 1998 05:29:36 -0400
+
+ircd (2.10.03-3) unstable; urgency=low, closes=19577 19613 18169 19684
+
+  * Updated to ircu2.10.03+.gpl.lagtime.chcnt.desynch.desynch1-2.desynch2-3.indent6-7.indent7-8.upper2-3.dead.
+  * Note the desynch patches add a new umode +g for seeing HACK notices.
+  * Dancer patches regularized and updated for indent6-7.patch.
+  * Version string reported correctly again.
+  * Closes missing ircd.8 bugs (#19577, #19613), postinst bug (#19577),
+    and chown bug (#18169), fixed in 2.10.03-1 in hamm.
+  
+ -- Johnie Ingram <johnie@debian.org>  Fri, 24 Apr 1998 04:54:42 -0400
+
+ircd (2.10.03-2) unstable; urgency=low
+
+  * Updated to 2.10.03.GPL.lagtime.chcnt.
+  * Applied topic patch from Søren A. Liby Clausen (salc@bgnett.no) so
+    dancer servers may set topics.
+
+ -- Johnie Ingram <johnie@debian.org>  Tue, 21 Apr 1998 07:24:44 -0400
+
+ircd (2.10.03-1) unstable; urgency=low
+
+  * New bugfix release, fixing WHOIS and WALLCHOPS commands and updating
+    documentation.
+  * The post-install script now uses set -e (important, #19684).
+  * HTML release notes, including docs for GLINE and the extended WHO
+    command, are now included.
+  * Corrected address of FSF in copyright file.
+  * Now includes manpage for ircd.8 (#19577, #19613).
+  * Configuration script now asks to run update-passwd if irc user is
+    missing or invalid, and does not fail if this is not done (#18169).
+  * In the dancer binary used at irc.debian.org:
+      * Now compiles on freebsd even when virtual hosting is enabled.
+      * The AWAY command does not send the RPL_NOWAWAY if the user is
+        already away, to compensate for buggy IRC scripts.
+      * The ISON command (used by bitchx /notify) does not send the
+        RPL_ISON if none of the specified nicks is on.
+      * IRC Operators can now be killed.
+      * The channel service (+k) flag can be set as an optional umode by
+        global Operators, making them unkillable again.
+      * Two new umode flags +f and +c are now accepted and noted, but
+        otherwise ignored.
+      * Maximum simultaneous channels per user is doubled to 20.
+      * Minor tweaks in the friendly messages.
+  * Extended the extended description text.
+  * Default organization is now listed as the World Domination Project.
+
+ -- Johnie Ingram <johnie@debian.org>  Mon, 13 Apr 1998 00:33:23 -0400
+
+ircd (2.10.02-2) linpeople; urgency=low
+
+  * Added official modeless3-4, config16-17, who6-8, resolv6-7, whois3-4,
+    tlim1-2, and virtual_host4-5 patches, fixing /whois support.
+  * Corrected address of FSF in copyright file.
+  * Added manpage for ircd.8.
+
+ -- Johnie Ingram <johnie@debian.org>  Sun,  5 Apr 1998 01:06:50 -0500
+
+ircd (2.10.02-1) unstable; urgency=low
+
+  * New upstream version, released hours before freeze of Debian 2.0.
+
+ -- Johnie Ingram <johnie@debian.org>  Sun, 15 Mar 1998 13:53:32 -0500
+
+ircd (2.10.01-4) unstable; urgency=low, closes=18140
+
+  * PID file is now in correct place (#18140).
+  * Added official kn2-3, config13-14, resolv4, invite2-3, partmsg,
+    whois2-3, virtual_host3-4, and TS10 patches.
+  * Dancer binary (used for irc.debian.org) now shows full remote motd,
+    notifies opers of client connects and disconnects, and handles
+    virtualhost ircd setups.
+  * It is no longer possible to GLINE *@* with dancer (long story).
+  * Full version is now ircu2.10.01+.config6-7.config7-8.lgline3.iwho.limit.glibc.motdcache2.trace.whois1-2.config8-9.statsw.sprintf2-3.msgtree2.memleak1-2.msgtree2-3.gline8-9.gline9-10.invite2.rbr.stats.numclients.whisper.whisper1-2.stats1-2.nokick1-2.chroot.config9-11.snomask7-8.limit1-3.userip1-3.userip3-4.config11-12.config12-13.umode2-3.akillsbt.who4-5.kn.kn1-2.freebsdcore2.msgtree3-5.y2k.glibc1-2.rmfunc.msgflags2.who5-6.nickchange2.glibc2-3.modeless3.kn2-3.config13-14.resolv4.invite2-3.partmsg.whois2-3.virtual_host3-4.TS10.
+  * Lets hope 2.10.02 is released soon -- this is getting silly.
+
+ -- Johnie Ingram <johnie@debian.org>  Sun,  8 Mar 1998 01:40:58 -0500
+
+ircd (2.10.01-3) unstable; urgency=low
+
+  * Added files describing new features of 2.10.x and 2.10.01.
+  * In anticipation of 2.10.02 release, updated to patchlevel ircu2.10.01+.config6-7.config7-8.lgline3.iwho.limit.glibc.motdcache2.trace.whois1-2.config8-9.statsw.sprintf2-3.msgtree2.memleak1-2.msgtree2-3.gline8-9.gline9-10.invite2.rbr.stats.numclients.whisper.whisper1-2.stats1-2.nokick1-2.chroot.config9-11.snomask7-8.limit1-3.userip1-3.userip3-4.config11-12.config12-13.umode2-3.akillsbt.who4-5.kn.kn1-2.freebsdcore2.msgtree3-5.y2k.glibc1-2.rmfunc.msgflags2.who5-6.nickchange2.glibc2-3.modeless3
+  * Greater use of debhelper.
+  * Added ircd "dancer" binary customized for smaller networks and for running as a
+    normal user: adds friendlymsg, killop, chinitdir, services, bigtopic,
+    nickdelay, and longnick hacks.
+  * Removed unnecessary dependency on ncurses.
+  * Updated to Standards-Version 2.4.0.0.
+
+ -- Johnie Ingram <johnie@debian.org>  Mon,  9 Feb 1998 10:34:18 -0500
+
+ircd (2.10.01-2) unstable; urgency=low
+
+  * Compiled for sparc architecture and reloaded to fix ftp site problem
+    (upstream source had disappeared).
+  * Added server numeric allocation docs.
+
+ -- Johnie Ingram <johnie@debian.org>  Tue, 23 Dec 1997 12:33:40 -0500
+
+ircd (2.10.01-1) unstable; urgency=low, closes=16228
+
+  * New upstream release, fixing core dump problem (#16228).
+  * Interserver link passwords stored in encrypted form.
+  * Expanded detail in copyright file.
+  * Added documentation on the settings used to compile ircd.
+
+ -- Johnie Ingram <johnie@debian.org>  Tue, 23 Dec 1997 12:08:55 -0500
+
+ircd (2.9.32-5) unstable; urgency=low
+
+  * Corrected ownership and permissions on /etc/ircd directory.
+
+ -- Johnie Ingram <johnie@debian.org>  Mon, 10 Nov 1997 13:53:00 -0500
+
+ircd (2.9.32-4) unstable; urgency=low, closes=12837 11831 11837 11822 11976 7591
+
+  * New maintainer.
+  * Compiled with libc6.
+  * Installation script security hole closed (#12837).
+  * Closed #7591, a manifestation of the '/' separator Bug 11822.
+  * Closes #11822, #11831, #11837 (see below), and #11976 (non-maintainer patch).
+
+ -- Johnie Ingram <johnie@debian.org>  Mon, 10 Nov 1997 13:24:22 -0500
+
+ircd (2.9.32-3.1) stable unstable; urgency=low
+
+  * Non-maintainer release.
+  * Fixed posinst not to use /tmp/$$ which is a security hole [#11764]
+  * Fixed permissions on /etc/ircd so that it isn't world readable [#11831, #11837 (1/2)].
+  * Fixed inetd.conf so that ircd is run as irc and not as root [#11831, #11837 (2/2)].
+  * Fixed postinst not to use '/' as a seperator for sed since that character could well 
+    be in /etc/news/organization [#11822]
+  * Adapted debian/rules to build with altgcc (libc5) so that package can go into stable.
+
+ -- James Troup <jjtroup@comp.brad.ac.uk>  Wed,  6 Aug 1997 20:25:23 +0200
+
+ircd (2.9.32-3) stable unstable; urgency=low
+
+  * Wrong userid/groupid on ircd binary
+  * #6186 only one connection allowed
+  * Newest debmake
+  * #6505 postinst bug
+
+ -- Christoph Lameter <clameter@debian.org>  Sat, 8 Feb 1997 19:53:22 -0800
+
+ircd (2.9.32-2) stable unstable; urgency=low
+
+  * static UID/GID
+
+ -- Christoph Lameter <clameter@debian.org>  Thu, 21 Nov 1996 12:06:41 -0800
+
+ircd (2.9.32-1) unstable; urgency=low
+
+  * Fixed hostname call in postinst and lots of other fixes
+  * updated to newest standards. debmake etc
+  * newest release
+
+ -- Christoph Lameter <clameter@debian.org>  Thu, 31 Oct 1996 15:44:53 -0800
+
+ircd (2.8.21-3) unstable; urgency=low
+
+  * Permissions for docs fixed. More dependencies.
+
+ -- Christoph Lameter <clameter@debian.org>  Fri, 20 Sep 1996 15:37:25 +0100
+
+ircd (2.8.21-2) unstable; urgency=low
+
+  * Initial Release with standards 2.0.1.0
+
+ -- Christoph Lameter <clameter@waterf.org>  Thu, 01 Sep 1996 15:37:25 +0100
--- ircd-ircu-2.10.11.04.dfsg1.orig/debian/control
+++ ircd-ircu-2.10.11.04.dfsg1/debian/control
@@ -0,0 +1,22 @@
+Source: ircd-ircu
+Section: net
+Priority: optional
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Martin Loschwitz <madkiss@debian.org>
+Build-Depends: debhelper (>= 4.1.33), dpatch (>= 1.11)
+Standards-Version: 3.5.9
+
+Package: ircd-ircu
+Architecture: any
+Depends: ${shlibs:Depends}
+Replaces: ircd-dalnet, ircd (>= 2.10.10.pl18-4)
+Conflicts: ircd-irc2
+Provides: ircd
+Description: Undernet IRC Server daemon
+ This is ircu, the Undernet Internet Relay Chat daemon, which allows
+ interactive character based communication between people connected to 
+ this server with IRC clients.  It is based on the latest stable version 
+ which can be downloaded from http://coder-com.undernet.org/.
+ .
+ This version is compiled for network usage but it can also run standalone.
+ You can modify its behaviour with reconfiguring/rebuilding.
--- ircd-ircu-2.10.11.04.dfsg1.orig/debian/preinst
+++ ircd-ircu-2.10.11.04.dfsg1/debian/preinst
@@ -0,0 +1,42 @@
+#! /bin/sh
+#
+# preinst for ircd-ircu: check for hangover of old ircd package
+#
+#
+
+set -e
+
+case "$1" in
+
+	install)
+
+	if [ -f "/etc/init.d/ircd" ]; then
+		echo "init-script of old ircd found, stopping it."
+		/etc/init.d/ircd stop
+	fi
+
+	if [ -d "/etc/ircd" ]; then
+		echo -n "hangovers of old ircd found, saving them in /etc/ircd/bak: "
+		mkdir /etc/ircd/bak/
+		for a in `find /etc/ircd -mindepth 1 -not -name bak`; do cp "$a" "/etc/ircd/bak/`echo \"$a\" | sed 's/\/etc\/ircd//g'`.bak"; done
+		echo "done."
+	fi
+
+	;;
+
+	abort-upgrade|upgrade)
+	
+	;;
+
+	*)
+        
+	echo "preinst called with unknown argument \`$1'" >&2
+	exit 1
+	
+	;;
+	
+esac
+
+#DEBHELPER#
+
+exit 0
--- ircd-ircu-2.10.11.04.dfsg1.orig/debian/maint/ircd.motd
+++ ircd-ircu-2.10.11.04.dfsg1/debian/maint/ircd.motd
@@ -0,0 +1,7 @@
+                         [ Debian GNU/Linux ]
+|------------------------------------------------------------------------|
+| This is Debians default IRCd server config. If you see this and you're |
+| the server administrator, edit files ircd.conf and ircd.motd in        |
+| /etc/ircd please.                                                      |
+|                                          Martin Loschwitz, April 10th  |
+|------------------------------------------------------------------------|
--- ircd-ircu-2.10.11.04.dfsg1.orig/debian/maint/remote.motd
+++ ircd-ircu-2.10.11.04.dfsg1/debian/maint/remote.motd
@@ -0,0 +1 @@
+Remote motd file, please edit!
--- ircd-ircu-2.10.11.04.dfsg1.orig/debian/maint/chkconf.8
+++ ircd-ircu-2.10.11.04.dfsg1/debian/maint/chkconf.8
@@ -0,0 +1,30 @@
+.\" @(#)chkconf.8 1.0 13 Apr 2002 
+.TH CHKCONF 8 "13 April 2002"
+.SH NAME
+chkconf \- check ircd config\-file 
+.SH SYNOPSIS
+.hy 0
+.BI "chkconf <ircd.conf>"
+.LP
+.SH DESCRIPTION
+.LP
+\fIchkconf\fP checks ircd config\-file <ircd.conf> for known errors.
+WARNING: Right now, chkconf is kinda outdated \-\- it doesn't know
+F\-Lines yet. Don't worry if it grumbles about "unknown values".
+.LP
+.SH COPYRIGHT
+(c) 1988,1989 University of Oulu, Computing Center, Finland,
+.LP
+(c) 1988,1989 Department of Information Processing Science,
+University of Oulu, Finland
+.LP
+(c) 1988,1989,1990,1991 Jarkko Oikarinen
+.LP
+For full COPYRIGHT see LICENSE file with IRC package.
+.LP
+.RE
+.SH "SEE ALSO"
+irc(1), ircd(8)
+.SH AUTHOR
+Jarkko Oikarinen, currently jto@tolsun.oulu.fi.
+Manual page was written by Martin Loschwitz in Apr 2002.
--- ircd-ircu-2.10.11.04.dfsg1.orig/debian/maint/oper.motd
+++ ircd-ircu-2.10.11.04.dfsg1/debian/maint/oper.motd
@@ -0,0 +1 @@
+MOTD for opers, please edit!
--- ircd-ircu-2.10.11.04.dfsg1.orig/debian/maint/ircd.conf
+++ ircd-ircu-2.10.11.04.dfsg1/debian/maint/ircd.conf
@@ -0,0 +1,67 @@
+# M-Line
+M:localhost.localdomain::Debian's ircd default configuration at localhost::1
+
+# A-Line
+A:This is Debian's default ircd configuration:Please edit your ircd.conf file:Contact <root@localhost> in case of questions
+
+# Y-Lines
+Y:1:90:0:20:100000 # for users
+Y:2:90:300:1:9000000 # for servers
+
+# I-Line
+I:Resolved::*@localhost::1
+i:*@*:1:Unresolved::1
+i:Resolved::*@*::1
+
+# P-Line
+P::::6667
+
+#F-Lines - Configuration things
+F:HUB:TRUE
+F:RANDOM_SEED:1598745896321459
+F:MAXCHANNELSPERUSER:15
+
+F:MPATH:/etc/ircd/ircd.motd
+F:RPATH:/etc/ircd/remote.motd
+
+# set log levels and priorities
+F:LOG:SYSTEM:FACILITY:USER
+F:LOG:CONFIG:FACILITY:USER
+F:LOG:OPERMODE:FACILITY:USER
+F:LOG:GLINE:FACILITY:USER
+F:LOG:JUPE:FACILITY:USER
+F:LOG:WHO:FACILITY:USER
+F:LOG:NETWORK:FACILITY:USER
+F:LOG:OPERKILL:FACILITY:USER
+F:LOG:SERVKILL:FACILITY:USER
+F:LOG:OPER:FACILITY:USER
+F:LOG:SOCKET:FACILITY:USER
+
+# Set log file
+F:LOG:SYSTEM:FILE:/var/log/ircd/critical.log
+F:LOG:CONFIG:FILE:/var/log/ircd/critical.log
+F:LOG:OPERMODE:FILE:/var/log/ircd/info.log
+F:LOG:GLINE:FILE:/var/log/ircd/info.log
+F:LOG:JUPE:FILE:/var/log/ircd/notices.log
+F:LOG:WHO:FILE:/var/log/ircd/info.log
+F:LOG:NETWORK:FILE:/var/log/ircd/critical.log
+F:LOG:OPERKILL:FILE:/var/log/ircd/info.log
+F:LOG:SERVKILL:FILE:/var/log/ircd/info.log
+F:LOG:OPER:FILE:/var/log/ircd/info.log
+F:LOG:SOCKET:FILE:/var/log/ircd/info.log
+
+# set log levels
+F:LOG:SYSTEM:LEVEL:CRIT
+F:LOG:CONFIG:LEVEL:CRIT
+F:LOG:OPERMODE:LEVEL:INFO
+F:LOG:GLINE:LEVEL:INFO
+F:LOG:JUPE:LEVEL:NOTICE
+F:LOG:WHO:LEVEL:INFO
+F:LOG:NETWORK:LEVEL:CRIT
+F:LOG:OPERKILL:LEVEL:INFO
+F:LOG:SERVKILL:LEVEL:INFO
+F:LOG:OPER:LEVEL:INFO
+F:LOG:SOCKET:LEVEL:INFO
+F:LOG:USER:LEVEL:DEBUG
+F:LOG:RESOLVER:LEVEL:DEBUG
+F:LOG:DEBUG:LEVEL:DEBUG
--- ircd-ircu-2.10.11.04.dfsg1.orig/debian/docs
+++ ircd-ircu-2.10.11.04.dfsg1/debian/docs
@@ -0,0 +1,29 @@
+README
+RELEASE.NOTES
+ChangeLog
+doc/api/*
+doc/Authors
+doc/Configure.help
+doc/example.conf
+doc/fda.txt
+doc/features.txt
+doc/freebsd.txt
+doc/history/*
+doc/iauth.txt
+doc/ircd.conf.sample
+doc/iso-time.html
+doc/p10.html
+doc/readme.asll
+doc/readme.chroot
+doc/readme.crules
+doc/readme.cvs
+doc/readme.features
+doc/readme.gline
+doc/readme.indent
+doc/readme.jupe
+doc/readme.log
+doc/readme.who
+doc/readme.www
+doc/snomask.html
+doc/strings.txt
+doc/exaconf
--- ircd-ircu-2.10.11.04.dfsg1.orig/debian/patches/02_s390_alpha_fix.dpatch
+++ ircd-ircu-2.10.11.04.dfsg1/debian/patches/02_s390_alpha_fix.dpatch
@@ -0,0 +1,56 @@
+#! /bin/sh -e
+## 02_s390_alpha_fix.dpatch by Martin Loschwitz <madkiss@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix FTBFS on s390 and alpha
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+case "$1" in
+    -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
+    -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1;;
+esac
+
+exit 0
+
+diff -ruN ircd-ircu-2.10.11.04.old/ircd/engine_poll.c ircd-ircu-2.10.11.04/ircd/engine_poll.c
+--- ircd-ircu-2.10.11.04.old/ircd/engine_poll.c	2002-09-14 22:44:32.000000000 +0200
++++ ircd-ircu-2.10.11.04/ircd/engine_poll.c	2003-03-23 15:12:38.000000000 +0100
+@@ -244,7 +244,7 @@
+   int nfds;
+   int i;
+   int errcode;
+-  size_t codesize;
++  socklen_t codesize;
+   struct Socket *sock;
+ 
+   while (running) {
+diff -ruN ircd-ircu-2.10.11.04.old/ircd/ircd_log.c ircd-ircu-2.10.11.04/ircd/ircd_log.c
+--- ircd-ircu-2.10.11.04.old/ircd/ircd_log.c	2002-08-24 18:08:48.000000000 +0200
++++ ircd-ircu-2.10.11.04/ircd/ircd_log.c	2003-03-23 15:12:10.000000000 +0100
+@@ -395,7 +395,7 @@
+ 
+   /* Build the basic log string */
+   vd.vd_format = fmt;
+-  vd.vd_args = vl;
++  __va_copy(vd.vd_args, vl);
+ 
+   /* save the length for writev */
+   /* Log format: "SYSTEM [SEVERITY]: log message" */
+diff -ruN ircd-ircu-2.10.11.04.old/ircd/send.c ircd-ircu-2.10.11.04/ircd/send.c
+--- ircd-ircu-2.10.11.04.old/ircd/send.c	2002-12-15 02:02:44.000000000 +0100
++++ ircd-ircu-2.10.11.04/ircd/send.c	2003-03-23 15:12:10.000000000 +0100
+@@ -697,7 +697,7 @@
+    * this is ok...
+    */
+   vd.vd_format = pattern;
+-  vd.vd_args = vl;
++  __va_copy(vd.vd_args, vl);
+   mb = msgq_make(0, ":%s " MSG_NOTICE " * :*** Notice -- %v", cli_name(&me),
+ 		 &vd);
+ 
--- ircd-ircu-2.10.11.04.dfsg1.orig/debian/patches/00list
+++ ircd-ircu-2.10.11.04.dfsg1/debian/patches/00list
@@ -0,0 +1,2 @@
+01_ircd_features
+02_s390_alpha_fix
--- ircd-ircu-2.10.11.04.dfsg1.orig/debian/patches/01_ircd_features.dpatch
+++ ircd-ircu-2.10.11.04.dfsg1/debian/patches/01_ircd_features.dpatch
@@ -0,0 +1,32 @@
+#! /bin/sh -e
+## 01_ircd_features.dpatch by Martin Loschwitz <madkiss@madkiss.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: hard-code path to ircd.pid
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+case "$1" in
+    -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
+    -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1;;
+esac
+
+exit 0
+
+diff -ruN ircd-ircu-2.10.11.02-old/ircd/ircd_features.c ircd-ircu-2.10.11.02/ircd/ircd_features.c
+--- ircd-ircu-2.10.11.02-old/ircd/ircd_features.c	2002-10-10 11:13:24.000000000 +0200
++++ ircd-ircu-2.10.11.02/ircd/ircd_features.c	2002-10-13 18:54:40.000000000 +0200
+@@ -275,7 +275,7 @@
+   /* Some misc. default paths */
+   F_S(MPATH, FEAT_CASE | FEAT_MYOPER, "ircd.motd", motd_init),
+   F_S(RPATH, FEAT_CASE | FEAT_MYOPER, "remote.motd", motd_init),
+-  F_S(PPATH, FEAT_CASE | FEAT_MYOPER | FEAT_READ, "ircd.pid", 0),
++  F_S(PPATH, FEAT_CASE | FEAT_MYOPER | FEAT_READ, "/var/run/ircd/ircd.pid", 0),
+ 
+   /* Networking features */
+   F_B(VIRTUAL_HOST, 0, 0, 0),
--- ircd-ircu-2.10.11.04.dfsg1.orig/debian/rules
+++ ircd-ircu-2.10.11.04.dfsg1/debian/rules
@@ -0,0 +1,110 @@
+#!/usr/bin/make -f
+
+export DH_COMPAT=4
+
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+# dpatch stuff
+include /usr/share/dpatch/dpatch.make
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+endif
+
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	INSTALL_PROGRAM += -s
+endif
+
+CONFIGURE_OPTIONS = --prefix=/usr --bindir=\$${prefix}/bin --sbindir=\$${prefix}/sbin --datadir=\$${prefix}/share --sysconfdir=/etc/ircd --mandir=\$${prefix}/share/man \
+		    --infodir=\$${prefix}/share/info --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --with-dpath=/etc/ircd --with-cpath=/etc/ircd/ircd.conf \
+		    --with-lpath=/var/log/ircd/ircd.log --with-domain=localhost
+
+configure: patch configure-stamp
+configure-stamp:
+
+	dh_testdir
+	./configure $(CONFIGURE_OPTIONS)
+	cat config.h | sed 's/\/bin\/ircd/\/sbin\/ircd-ircu/g' > config.h.deb && mv config.h.deb config.h
+	touch configure-stamp
+
+build: configure build-stamp
+build-stamp: 
+	
+	dh_testdir
+	$(MAKE)
+	touch build-stamp
+
+clean: unpatch
+	
+	dh_testdir
+	dh_testroot
+
+	rm -rf config/config.log config/config.cache doc/stamp-m ircd/stamp-m build-stamp configure-stamp
+	
+	-$(MAKE) distclean
+	rm -rf config/config.h config/.config
+
+	-test -r /usr/share/misc/config.sub && \
+	  cp -f /usr/share/misc/config.sub config.sub
+	-test -r /usr/share/misc/config.guess && \
+	  cp -f /usr/share/misc/config.guess config.guess
+	
+	dh_clean
+
+install: build
+	
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+binary-indep: build install
+
+binary-arch: build install
+	
+	dh_testdir
+	dh_testroot
+
+	# rename exaconf.2 to exaconf
+	-mv doc/exaconf.2 doc/exaconf
+
+	dh_installdocs
+	dh_installdebconf
+	
+	dh_installman doc/ircd.8 debian/maint/chkconf.8 
+
+	dh_installinit
+
+	dh_installchangelogs ChangeLog
+	
+	# install config-files to /etc/ircd
+	cp debian/maint/ircd.conf debian/ircd-ircu/etc/ircd/ircd.conf
+	cp debian/maint/ircd.motd debian/ircd-ircu/etc/ircd/ircd.motd
+	cp debian/maint/remote.motd debian/ircd-ircu/etc/ircd/remote.motd
+	cp debian/maint/oper.motd debian/ircd-ircu/etc/ircd/oper.motd
+
+	# install ircd +s
+	install -o irc -g irc -m 0755 ircd/ircd debian/ircd-ircu/usr/sbin/ircd-ircu
+	install -o irc -g irc -m 0755 ircd/chkconf debian/ircd-ircu/usr/sbin/chkconf
+
+	dh_fixperms
+	
+	# fix directory permissions for logdir
+	chown -R irc:irc debian/ircd-ircu/var/log/ircd
+	chown -R irc:irc debian/ircd-ircu/var/run/ircd
+
+	# move manpage
+	mv debian/ircd-ircu/usr/share/man/man8/ircd.8 debian/ircd-ircu/usr/share/man/man8/ircd-ircu.8
+	
+	# proceed
+	dh_strip
+	dh_compress
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure