Merge lp:~noskcaj/ubuntu/saucy/xinetd/2.3.15 into lp:ubuntu/saucy/xinetd

[Jackson Doak]

Merged from debian unstable

[Martin Pitt (pitti)]

I removed the patch noise and dropped the extra lsb-base dependency; this is priority required and the last LTS has a new enough version. Uploaded, thanks!

review: Approve

=== added directory '.pc'
=== added file '.pc/.quilt_patches'
--- .pc/.quilt_patches	1970-01-01 00:00:00 +0000
+++ .pc/.quilt_patches	2013-08-14 10:06:03 +0000
@@ -0,0 +1,1 @@
+debian/patches
 
=== added file '.pc/.quilt_series'
--- .pc/.quilt_series	1970-01-01 00:00:00 +0000
+++ .pc/.quilt_series	2013-08-14 10:06:03 +0000
@@ -0,0 +1,1 @@
+series
 
=== added file '.pc/.version'
--- .pc/.version	1970-01-01 00:00:00 +0000
+++ .pc/.version	2013-08-14 10:06:03 +0000
@@ -0,0 +1,1 @@
+2
 
=== added directory '.pc/000001-documentation_fixes'
=== added file '.pc/000001-documentation_fixes/.timestamp'
=== added directory '.pc/000001-documentation_fixes/xinetd'
=== added file '.pc/000001-documentation_fixes/xinetd/itox.8'
--- .pc/000001-documentation_fixes/xinetd/itox.8	1970-01-01 00:00:00 +0000
+++ .pc/000001-documentation_fixes/xinetd/itox.8	2013-08-14 10:06:03 +0000
@@ -0,0 +1,19 @@
+.TH ITOX 8 "October 1999" "xinetd"
+.SH NAME
+itox \- converts inetd.conf style configuration files to xinetd.conf
+.SH SYNOPSIS
+itox [-daemon_dir <dir_path>]
+.SH DESCRIPTION
+.B itox
+takes on its standard input inetd.conf style entries and dumps to
+standard output the corresponding xinetd.conf style entries.
+.SH OPTIONS
+.TP
+.I -daemon_dir <dir_path>
+Specifies the file name of the TCP daemon used in the inetd.conf file.
+.SH EXAMPLES
+itox -daemon_dir /usr/sbin/tcpd < inetd.conf > xinetd.conf
+.SH AUTHOR
+xinetd and itox were written by Panagiotis Tsirigotis.
+.sp
+This man page was written by Norbert Veber <[e-mail]>.
 
=== added file '.pc/000001-documentation_fixes/xinetd/xinetd.conf.man'
--- .pc/000001-documentation_fixes/xinetd/xinetd.conf.man	1970-01-01 00:00:00 +0000
+++ .pc/000001-documentation_fixes/xinetd/xinetd.conf.man	2013-08-14 10:06:03 +0000
@@ -0,0 +1,1253 @@
+.\"(c) Copyright 1992, by Panagiotis Tsirigotis
+.\"(c) Sections Copyright 1998-2001 by Rob Braun
+.\"All rights reserved.  The file named COPYRIGHT specifies the terms 
+.\"and conditions for redistribution.
+.\"
+.\" $Id: xinetd.conf.man,v 1.20 2007-09-20 14:58:27 bbraun Exp $
+.TH XINETD.CONF 5 "14 June 2001"
+.\" *************************** NAME *********************************
+.SH NAME
+xinetd.conf \- Extended Internet Services Daemon configuration file
+.\" *********************** DESCRIPTION ****************************
+.SH DESCRIPTION
+.B "xinetd.conf"
+is the configuration file that
+determines the services provided by \fBxinetd\fP.
+Any line whose first non-white-space character is a '#' is considered
+a comment line. Empty lines are ignored.
+.LP
+The file contains entries of the form:
+.RS
+.nf
+.ft B
+.sp
+service <service_name>
+{
+.RS
+.ft B
+<attribute> <assign_op> <value> <value> ...
+.I "..."
+.RE
+}
+.ft R
+.fi
+.RE
+.LP
+The assignment operator,
+.I assign_op,
+can be one of 
+.B '=', 
+.B '+=',
+.B '-='.
+The majority of attributes support only the simple assignment operator,
+.B '='.
+Attributes whose value is a set of values support all assignment operators.
+For such attributes,
+.B '+=' 
+means adding a value to the set and 
+.B '-='
+means removing a value from the set.
+A list of these attributes will be given
+after all the attributes are described.
+.LP
+Each entry defines a service identified by the \fIservice_name\fP.
+The following is a list of available attributes:
+.TP 17
+.B id
+This attribute is used to uniquely identify a service.
+This is useful because there exist services that can use different 
+protocols and need to be described with different entries in the
+configuration file.
+By default, the service id is the same as the service name.
+.TP
+.B type
+Any combination of the following values may be used:
+.RS
+.TP 12
+.B RPC
+if this is an RPC service
+.TP
+.B INTERNAL
+if this is a service provided by \fBxinetd\fP.
+.TP
+.B TCPMUX/TCPMUXPLUS
+if this is a service that will be started according to the RFC 1078 protocol on the TCPMUX well-known port. See the section describing TCPMUX services below.
+.TP
+.B UNLISTED
+if this is a service not listed in a standard system file
+(like
+.I /etc/rpc 
+for RPC services, or
+.I /etc/services
+for non-RPC services).
+.RE
+.TP
+.B flags
+Any combination of the following flags may be used:
+.RS
+.TP 12
+.B INTERCEPT
+Intercept packets or accepted connections in order to verify that they
+are coming from acceptable locations (internal or multi-threaded
+services cannot be intercepted).
+.TP
+.B NORETRY
+Avoid retry attempts in case of fork failure.
+.TP
+.B IDONLY
+Accept connections only when the remote end identifies the remote user
+(i.e. the remote host must run an identification server).
+This flag applies only to connection-based services.
+This flag is ineffective if the
+.B USERID
+log option is not used.
+.TP
+.B NAMEINARGS
+This will cause the first argument in "server_args" to be argv[0] when
+executing the server, as specified in "server".  This allows you to use
+tcpd by putting tcpd in "server" and the name of the server in "server_args"
+like in normal inetd.
+.TP
+.B NODELAY
+If the service is a tcp service and the NODELAY flag is set, then the
+TCP_NODELAY flag will be set on the socket.  If the service is not
+a tcp service, this option has no effect.
+.TP
+.B KEEPALIVE
+If the service is a tcp service and the KEEPALIVE flag is set, then 
+the SO_KEEPALIVE socket flag will be set on the socket.  If the service
+is not a tcp service, this option has no effect.
+.TP
+.B NOLIBWRAP
+This disables internal calling of the tcpwrap library to determine access
+to the service.  This may be needed in order to use libwrap functionality
+not available to long-running processes such as xinetd; in this case,
+the tcpd program can be called explicitly (see also the NAMEINARGS flag).
+For RPC services using TCP transport, this flag is automatically turned on,
+because xinetd cannot get remote host address information for the rpc port.
+.TP
+.B SENSOR
+This replaces the service with a sensor that detects accesses to the 
+specified port. NOTE: It will NOT detect stealth scans. This flag 
+should be used only on services that you know you don't need. When an 
+access is made to this service's port, the IP Address is added to a global
+no_access list. This causes all subsequent accesses from the originating IP
+address to be denied access until the deny_time setting expires. The amount
+of time spent on this list is configurable as the deny_time attribute. The
+SENSOR flag will also cause xinetd to consider the server attribute to be
+INTERNAL no matter what is typed on the same line. Another important thing
+to remember is that if the socket_type is set to stream, then the wait 
+attribute should be set to no.
+.TP
+.B IPv4
+Sets the service to be an IPv4 service (AF_INET).
+.TP
+.B IPv6
+Sets the service to be an IPv6 service (AF_INET6), if IPv6 is available on the system.
+.TP
+.B LABELED
+The LABELED flag will tell xinetd to change the child processes SE Linux context to match that of the incoming connection as it starts the service. This only works for external tcp non-waiting servers and is an error if applied to an internal, udp, or tcp-wait server.
+.TP
+.B REUSE
+The REUSE flag is deprecated.  All services now implicitly use the REUSE flag.
+.RE
+.TP
+.B disable
+This is boolean "yes" or "no".  This will result in the service
+being disabled and not starting.  See the DISABLE flag description.
+.RE
+.TP
+.B socket_type
+Possible values for this attribute include:
+.RS
+.TP 12
+.I stream
+stream-based service
+.TP
+.I dgram
+datagram-based service
+.TP
+.I raw
+service that requires direct access to IP
+.TP
+.I seqpacket
+service that requires reliable sequential datagram transmission
+.RE
+.TP
+.B protocol
+determines the protocol that is employed by the service.
+The protocol must exist in
+.I /etc/protocols.
+If this
+attribute is not defined, the default protocol employed by the service
+will be used.
+.TP
+.B wait
+This attribute determines if the service is single-threaded or
+multi-threaded and whether or not xinetd accepts the connection or the server
+program accepts the connection. If its value is \fIyes\fP, the service is 
+single-threaded; this means that \fBxinetd\fP will start the server and then 
+it will stop handling requests for the service until the server dies and that
+the server software will accept the connection. If the attribute value is 
+\fIno\fP, the service is multi-threaded and \fBxinetd\fP will keep handling 
+new service requests and xinetd will accept the connection. It should be noted 
+that udp/dgram services normally expect the value to be yes since udp is not
+connection oriented, while tcp/stream servers normally expect the value to be
+no.
+.TP
+.B user
+determines the uid for the server process. The user attribute can either 
+be numeric or a name. If a name is given (recommended),  the user name must 
+exist in
+.I /etc/passwd.
+This attribute is ineffective if the effective user ID 
+of \fBxinetd\fP is not super-user.
+.TP
+.B group
+determines the gid for the server process. The group attribute can either
+be numeric or a name. If a name is given (recommended), the group name must 
+exist in
+.I /etc/group.
+If a group is not specified, the group
+of \fIuser\fP will be used (from 
+.I /etc/passwd).
+This attribute is ineffective if the effective user ID 
+of \fBxinetd\fP is not super-user and if the \fBgroups\fP attribute
+is not set to 'yes'.
+.TP
+.B instances
+determines the number of servers that can be simultaneously active
+for a service (the default is no limit). The value of this
+attribute can be either a number or
+.B UNLIMITED
+which means that there is no limit.
+.TP
+.B nice
+determines the server priority. Its value is a (possibly negative) number;
+check nice(3) for more information.
+.TP
+.B server
+determines the program to execute for this service.
+.TP
+.B server_args
+determines the arguments passed to the server. In contrast to \fBinetd\fP,
+the server name should \fInot\fP be included in \fIserver_args\fP.
+.TP
++.B libwrap
+overrides the service name passed to libwrap (which defaults to the
+server name, the first server_args component with NAMEINARGS, the id
+for internal services and the service name for redirected services).
+This attribute is only valid if xinetd has been configured with the libwrap
+option.
+.TP
+.B only_from
+determines the remote hosts to which the particular
+service is available.
+Its value is a list of IP addresses which can be specified in any
+combination of the following ways:
+.RS
+.TP 5
+.B a)
+a numeric address in the form of %d.%d.%d.%d. If the rightmost components are 
+0, they are treated as wildcards 
+(for example, 128.138.12.0 matches all hosts on the 128.138.12 subnet).
+0.0.0.0 matches all Internet addresses.  IPv6 hosts may be specified in the form of abcd:ef01::2345:6789.  The rightmost rule for IPv4 addresses does not apply to IPv6 addresses.
+.TP
+.B b)
+a factorized address in the form of %d.%d.%d.{%d,%d,...}.
+There is no need for all 4 components (i.e. %d.%d.{%d,%d,...%d} is also ok).
+However, the factorized part must be at the end of the address.  This form does not work for IPv6 hosts.
+.TP
+.B c)
+a network name (from
+.I /etc/networks).  This form does not work for IPv6 hosts.
+.TP
+.B d)
+a host name.  When a connection is made to xinetd, a reverse lookup is
+performed, and the canonical name returned is compared to the specified host
+name.  You may also use domain names in the form of .domain.com.  If the
+reverse lookup of the client's IP is within .domain.com, a match occurs.
+.TP
+.B e)
+an ip address/netmask range in the form of 1.2.3.4/32.  IPv6 address/netmask
+ranges in the form of 1234::/46 are also valid.
+.RE
+.TP
+.B ""
+Specifying this attribute
+without a value makes the service available to nobody.
+.TP
+.B no_access
+determines the remote hosts to which the particular
+service is unavailable. Its value can be specified in the same way as the
+value of the \fBonly_from\fP
+attribute. These two attributes determine the location access control 
+enforced by \fBxinetd\fP. If none of the two is specified for a service,
+the service is available to anyone. If both are specified for a service,
+the one that is the better match for
+the address of the remote host determines
+if the service is available to that host (for example, if the 
+\fBonly_from\fP list contains 128.138.209.0 and the
+\fBno_access\fP list contains 128.138.209.10
+then the host with the address 128.138.209.10 can not access the service).
+.TP
+.B access_times
+determines the time intervals when the service is available. An interval
+has the form \fIhour:min-hour:min\fP (connections 
+.I will 
+be accepted at the bounds of an interval). Hours can range from 0 to 23 and
+minutes from 0 to 59.
+.TP
+.B log_type
+determines where the service log output is sent. There are two formats:
+.RS
+.TP
+.B SYSLOG " \fIsyslog_facility [syslog_level]\fP"
+The log output is sent to syslog at the specified facility. Possible facility
+names include:
+.I daemon,
+.I auth,
+.I authpriv,
+.I user,
+.I mail,
+.I lpr,
+.I news,
+.I uucp,
+.I ftp
+.I "local0-7."
+Possible level names include:
+.I emerg,
+.I alert,
+.I crit,
+.I err,
+.I warning,
+.I notice,
+.I info,
+.I debug.
+If a level is not present, the messages will be recorded at the
+.I info
+level.
+.TP
+.B FILE " \fIfile [soft_limit [hard_limit]]\fP"
+The log output is appended to \fIfile\fP which will be created if it does
+not exist. Two limits on the size of the log file can be optionally specified.
+The first limit is a soft one;
+.B xinetd 
+will log a message the first time this limit is exceeded (if 
+.B xinetd
+logs to syslog, the message will be sent at the 
+.I alert
+priority level).
+The second limit is a hard limit; 
+.B xinetd 
+will stop logging for the affected service (if the log file is a
+common log file, then more than one service may be affected)
+and will log a message about this (if
+.B xinetd
+logs to syslog, the message will be sent at the 
+.I alert
+priority level).
+If a hard limit is not specified, it defaults to the soft limit
+increased by 1% but the extra size must be within the parameters
+.SM LOG_EXTRA_MIN
+and
+.SM LOG_EXTRA_MAX
+which default to 5K and 20K respectively (these constants are defined in 
+\fIxconfig.h\fP).
+.RE
+.TP
+.B log_on_success
+determines what information is logged when a server is started and when
+that server exits (the service id is always included in the log entry).
+Any combination of the following values may be specified:
+.RS
+.TP 12
+.B PID
+logs the server process id (if the service is implemented by \fBxinetd\fP
+without forking another process the logged process id will be 0)
+.TP
+.B HOST
+logs the remote host address
+.TP
+.B USERID
+logs the user id of the remote user using the RFC 1413 identification protocol.
+This option is available only for multi-threaded stream services.
+.TP
+.B EXIT
+logs the fact that a server exited along with the exit status or the
+termination signal
+(the process id is also logged if the
+.B PID
+option is used)
+.TP
+.B DURATION 
+logs the duration of a service session
+.TP
+.B TRAFFIC
+logs the total bytes in and out for a redirected service.
+.RE
+.TP
+.B log_on_failure
+determines what information is logged when a server cannot be started
+(either because of a lack of resources or because of access control
+restrictions). The service id is always included in the log entry along
+with the reason for failure.
+Any combination of the following values may be specified:
+.RS
+.TP 12
+.B HOST
+logs the remote host address.
+.TP
+.B USERID
+logs the user id of the remote user using the RFC 1413 identification protocol.
+This option is available only for multi-threaded stream services.
+.TP 
+.B ATTEMPT
+logs the fact that a failed attempt was made
+(this option is implied by all others).
+.RE
+.TP
+.B rpc_version
+determines the RPC version for a RPC service. The version can be
+a single number or a range in the form \fInumber\fP-\fInumber\fP.
+.TP
+.B rpc_number
+determines the number for an
+.I UNLISTED
+RPC service (this attribute is ignored if the service is not unlisted).
+.TP
+.B env
+The value of this attribute is a list of strings of the form 'name=value'.
+These strings will be added to the environment before
+starting a server (therefore the server's environment will include
+\fBxinetd\fP's environment plus the specified strings).
+.TP
+.B passenv
+The value of this attribute is a list of environment variables from
+\fBxinetd\fP's environment that will be passed to the server.
+An empty list implies passing no variables to the server
+except for those explicitly defined using the
+.I env
+attribute.
+(notice that you can use this attribute in conjunction with the
+.I env
+attribute to specify exactly what environment will be passed to the server).
+.TP
+.B port
+determines the service port. If this attribute is specified for a service 
+listed in
+.I /etc/services,
+it must be equal to the port number listed in that file.
+.TP
+.B redirect
+Allows a tcp service to be redirected to another host.  When xinetd receives
+a tcp connection on this port it spawns a process that establishes a
+connection to the host and port number specified, and forwards all data
+between the two hosts.  This option is useful when your internal machines
+are not visible to the outside world.  Syntax is: redirect = (ip address) 
+(port).  You can also use a hostname instead of the IP address in this
+field.  The hostname lookup is performed only once, when xinetd is 
+started, and the first IP address returned is the one that is used
+until xinetd is restarted.
+The "server" attribute is not required when this option is specified.  If
+the "server" attribute is specified, this attribute takes priority.
+.TP
+.B bind
+Allows a service to be bound to a specific interface on the machine.
+This means you can have a telnet server listening on a local, secured
+interface, and not on the external interface.  Or one port on one interface
+can do something, while the same port on a different interface can do 
+something completely different.  Syntax: bind = (ip address of interface).
+.TP
+.B interface
+Synonym for bind.
+.TP
+.B banner
+Takes the name of a file to be splatted at the remote host when a 
+connection to that service is established.  This banner is printed
+regardless of access control.  It should *always* be printed when
+a connection has been made.  \fBxinetd\fP outputs the file as-is,
+so you must ensure the file is correctly formatted for the service's
+protocol.  In paticular, if the protocol requires CR-LF pairs for line
+termination, you must supply them.
+.TP
+.B banner_success
+Takes the name of a file to be splatted at the remote host when a
+connection to that service is granted.  This banner is printed
+as soon as access is granted for the service.  \fBxinetd\fP outputs the
+file as-is, so you must ensure the file is correctly formatted for
+the service's protocol.  In paticular, if the protocol requires CR-LF
+pairs for line termination, you must supply them.
+.TP
+.B banner_fail
+Takes the name of a file to be splatted at the remote host when a
+connection to that service is denied.  This banner is printed 
+immediately upon denial of access.  This is useful for informing
+your users that they are doing something bad and they shouldn't be
+doing it anymore.  \fBxinetd\fP outputs the file as-is,
+so you must ensure the file is correctly formatted for the service's
+protocol.  In paticular, if the protocol requires CR-LF pairs for line
+termination, you must supply them.
+.TP
+.B per_source
+Takes an integer or "UNLIMITED" as an argument.  This specifies the
+maximum instances of this service per source IP address.  This can
+also be specified in the defaults section.
+.TP
+.B cps
+Limits the rate of incoming connections.  Takes two arguments.  
+The first argument is the number of connections per second to handle.
+If the rate of incoming connections is higher than this, the service
+will be temporarily disabled.  The second argument is the number of
+seconds to wait before re-enabling the service after it has been disabled.
+The default for this setting is 50 incoming connections and the interval
+is 10 seconds.
+.TP
+.B max_load
+Takes a floating point value as the load at which the service will 
+stop accepting connections.  For example: 2 or 2.5.  The service
+will stop accepting connections at this load.  This is the one minute
+load average.  This is an OS dependent feature, and currently only
+Linux, Solaris, and FreeBSD are supported for this.  This feature is
+only avaliable if xinetd was configured with the -with-loadavg option.
+.TP
+.B groups
+Takes either "yes" or "no".  If the groups attribute is set to
+"yes", then the server is executed with access to the groups that the
+server's effective UID has access to.  Alternatively, if the \fBgroup\fP
+attribute is set, the server is executed with access to the groups
+specified.  If the groups attribute is set 
+to "no", then the server runs with no supplementary groups.  This
+attribute must be set to "yes" for many BSD systems.  This attribute
+can be set in the defaults section as well.
+.TP
+.B mdns
+Takes either "yes" or "no".  On systems that support mdns registration
+of services (currently only Mac OS X), this will enable or disable
+registration of the service.  This defaults to "yes".
+.TP
+.B umask
+Sets the inherited umask for the service.  Expects an octal value.  
+This option may be set in the "defaults" section to set a umask
+for all services.  xinetd sets its own umask to the previous umask
+OR'd with 022.  This is the umask that will be inherited by all 
+child processes if the umask option is not used.
+.TP
+.B enabled
+Takes a list of service ID's to enable.  This will enable only the
+services listed as arguments to this attribute; the rest will be
+disabled.  If you have 2 ftp services, you will need to list both of
+their ID's and not just ftp. (ftp is the service name, not the ID. It
+might accidentally be the ID, but you better check.) Note that the 
+service "disable" attribute and "DISABLE" flag can prevent a service 
+from being enabled despite being listed in this attribute. 
+.TP
+.B include
+Takes a filename in the form of "include /etc/xinetd/service".
+The file is then parsed as a new configuration file.  It is not 
+the same thing as pasting the file into xinetd.conf where the 
+include directive is given.  The included file must be in the 
+same form as xinetd.conf.  This may not be specified from within
+a service.  It must be specified outside a service declaration.
+.TP
+.B includedir
+Takes a directory name in the form of "includedir /etc/xinetd.d".
+Every file inside that directory, excluding files with names containing
+a dot ('.') or ending with a tilde ('~'), will be parsed as xinetd 
+configuration files.  The files will be parsed in alphabetical order
+according to the C locale. This allows you to specify services one 
+per file within a directory.  The
+.B includedir
+directive may not be specified from within a service declaration.  
+.TP
+.B rlimit_as
+Sets the Address Space resource limit for the service. One parameter
+is required, which is either a positive integer representing the number
+of bytes to set the limit to (K or M may be used to specify
+kilobytes/megabytes) or "UNLIMITED".  Due to the way Linux's libc malloc
+is implemented, it is more useful to set this limit than rlimit_data,
+rlimit_rss and rlimit_stack. This resource limit is only implemented on
+Linux systems.
+.TP
+.B rlimit_cpu
+Sets the maximum number of CPU seconds that the service may use.
+One parameter is required, which is either a positive integer representing
+the number of CPU seconds limit to, or "UNLIMITED".
+.TP
+.B rlimit_data
+Sets the maximum data size resource limit for the service.
+One parameter is required, which is either a positive integer representing
+the number of bytes or "UNLIMITED".
+.TP
+.B rlimit_rss
+Sets the maximum resident set size limit for the service.  Setting this
+value low will make the process a likely candidate for swapping out to
+disk when memory is low.
+One parameter is required, which is either a positive integer representing
+the number of bytes or "UNLIMITED".
+.TP
+.B rlimit_stack
+Set the maximum stack size limit for the service.
+One parameter is required, which is either a positive integer representing
+the number of bytes or "UNLIMITED".
+.TP
+.B deny_time
+Sets the time span that access to all services on all IP addresses are
+denied to someone that sets off the SENSOR. The unit of time is in minutes.
+Valid options are: FOREVER, NEVER, and a numeric value. FOREVER causes
+the IP address not to be purged until xinetd is restarted. NEVER has the
+effect of just logging the offending IP address. A typical time value would
+be 60 minutes. This should stop most DOS attacks while allowing IP addresses
+that come from a pool to be recycled for legitimate purposes. This option
+must be used in conjunction with the SENSOR flag.
+.LP
+You don't need to specify all of the above attributes for each service.
+The necessary attributes for a service are:
+.sp 1
+.PD .1v
+.RS
+.TP 18
+.B socket_type
+.TP
+.B user
+(non-\fIinternal\fP services only)
+.TP
+.B server
+(non-\fIinternal\fP services only)
+.TP
+.B wait
+.TP
+.B protocol
+(\fIRPC\fP and \fIunlisted\fP services only)
+.TP
+.B rpc_version
+(\fIRPC\fP services only)
+.TP
+.B rpc_number
+(\fIunlisted\fP RPC services only)
+.TP
+.B port
+(\fIunlisted\fP non-RPC services only)
+.RE
+.PD
+.LP
+The following attributes support all assignment operators:
+.sp 1
+.PD .1v
+.RS
+.TP 18
+.B only_from
+.TP
+.B no_access
+.TP
+.B log_on_success
+.TP
+.B log_on_failure
+.TP
+.B passenv
+.TP
+.B env
+(does not support the
+.B '-='
+operator)
+.RE
+.PD
+.LP
+These attributes can also appear more than once in a service entry.
+The remaining attributes support only the 
+.B '='
+operator and can appear at most once in a service entry.
+.LP
+The configuration file may also contain a single defaults entry
+that has the form
+.LP
+.RS
+.nf
+.ft B
+defaults
+{
+.RS
+.ft B
+<attribute> = <value> <value> ...
+.I "..."
+.RE
+.ft B
+}
+.ft R
+.fi
+.RE
+.LP
+This entry provides default attribute values for service entries that
+don't specify those attributes. Possible default attributes:
+.sp 1
+.PD .1v
+.RS
+.TP 18
+.B log_type
+(cumulative effect)
+.TP
+.B bind 
+.TP
+.B per_source 
+.TP
+.B umask 
+.TP
+.B log_on_success
+(cumulative effect)
+.TP
+.B log_on_failure
+(cumulative effect)
+.TP
+.B only_from
+(cumulative effect)
+.TP
+.B no_access
+(cumulative effect)
+.TP
+.B passenv
+(cumulative effect)
+.TP
+.B instances
+.TP
+.B disabled
+(cumulative effect)
+.TP
+.B enabled
+(cumulative effect)
+.TP
+.B banner 
+.TP
+.B banner_success 
+.TP
+.B banner_fail
+.TP
+.B per_source 
+.TP
+.B groups 
+.TP
+.B cps 
+.TP
+.B max_load 
+.TP
+.RE
+.PD
+.LP
+Attributes with a cumulative effect can be specified multiple times
+with the values specified each time accumulating (i.e. '=' does
+the same thing as '+=').
+With the exception of
+.I disabled
+they all have the same meaning as if they were specified in a service entry.
+.I disabled
+determines services that are disabled even if they have entries in
+the configuration file. This allows for quick reconfiguration by
+specifying disabled services with the
+.I disabled
+attribute instead of commenting them out.
+The value of this attribute is a list of space separated service ids.
+.I enabled 
+has the same properties as disabled.  The difference being that
+.I enabled 
+is a list of which services are to be enabled.  If 
+.I enabled 
+is specified, only the services specified are available.  If
+.I enabled 
+is not specified, all services are assumed to be enabled,
+except those listed in 
+.I disabled.
+
+.\" *********************** INTERNAL SERVICES ****************************
+.SH "INTERNAL SERVICES"
+.LP
+\fBxinetd\fP provides the following services internally (both
+stream and datagram based):
+.I echo,
+.I time,
+.I daytime,
+.I chargen,
+and
+.I discard.
+These services are under the same access restrictions as all other
+services except for the ones that don't require \fBxinetd\fP to fork
+another process for them. Those ones (\fItime\fP, \fIdaytime\fP,
+and the datagram-based \fIecho\fP, \fIchargen\fP, and \fIdiscard\fP) 
+have no limitation in the number of 
+.B instances.
+.LP
+.\" *********************** TCPMUX Services ****************************
+.SH "TCPMUX Services"
+.LP
+\fBxinetd\fP supports TCPMUX services that conform to RFC 1078. These services 
+may not have a well-known port associated with them, and can be accessed via 
+the TCPMUX well-known port.
+.LP
+For each service that is to be accessed via TCPMUX, a service entry in
+\fB/etc/xinetd.conf\fP or in a configuration file in an \fBincludedir\fP 
+directory must exist.
+.LP
+The \fIservice_name\fP field (as defined above for each service in any 
+\fBxinetd\fP 
+configuration file) must be identical to the string that is passed (according 
+to RFC 1078 protocol) to \fBxinetd\fP when the remote service requestor first 
+makes the connection on the TCPMUX well-known port.  Private protocols should 
+use a service name that has a high probability of being unique. One way is to 
+prepend the service name with some form of organization ID.
+.LP
+The \fItype\fP field can be either \fBTCPMUX\fP or \fBTCPMUXPLUS\fP. If the
+type is \fBTCPMUXPLUS\fP, \fBxinetd\fP will handle the initial protocol
+handshake (as defined in RFC 1078) with the calling process before initiating
+the service. If the type is \fBTCPMUX\fP, the server that is started is
+responsible for performing the handshake.
+.LP
+The \fItype\fP field should also include \fBUNLISTED\fP if the service is
+not listed in a standard system file
+(like
+.I /etc/rpc
+for RPC services, or
+.I /etc/services
+for non-RPC services).
+.LP	
+The \fIsocket_type\fP for these services must be \fBstream\fP, and the 
+\fIprotocol\fP must be \fBtcp\fP.
+.LP
+Following is a sample TCPMUX service configuration:
+.PD .1v
+.RS
+.nf
+
+service myorg_server
+{
+.RS
+.IP disable 20
+= no
+.IP type
+= TCPMUX
+.IP socket_type
+= stream
+.IP protocol
+= tcp
+.IP wait
+= no
+.IP user
+= root
+.IP server
+= /usr/etc/my_server_exec
+.RE
+}
+.fi
+.RE
+.PD
+.LP
+Besides a service entry for each service that can be accessed
+via the TCPMUX well-known port, a service entry for TCPMUX itself
+must also be included in the \fBxinetd\fP configuration. Consider the following
+sample:
+.PD .1v
+.RS
+.nf
+
+service tcpmux
+{
+.RS
+.IP type 20
+= INTERNAL
+.IP id
+= tcpmux
+.IP socket_type
+= stream
+.IP protocol
+= tcp
+.IP user
+= root
+.IP wait
+= no
+.RE
+}
+.fi
+.RE
+.PD                                                                               
+
+
+
+.\" *********************** NOTES ****************************
+.SH NOTES
+.IP 1. 4
+The following service attributes \fIcannot\fP be changed on reconfiguration:
+.B socket_type,
+.B wait,
+.B protocol,
+.B type.
+.IP 2.
+When the attributes
+.I only_from
+and
+.I no_access
+are not specified for a service (either directly or via \fIdefaults\fP)
+the address check is considered successful (i.e. access will not be
+denied).
+.IP 3.
+The address check is based on the IP address of the remote host and
+not on its domain address. We do this so that we can avoid
+remote name lookups which may take a long time (since
+.B xinetd
+is single-threaded, a name lookup will prevent the daemon from
+accepting any other requests until the lookup is resolved).
+The down side of this scheme is that if the IP address of a remote
+host changes, then access to that host may be denied until
+.B xinetd
+is reconfigured.
+Whether access is actually denied or not will depend on whether the
+new host IP address is among those allowed access. For example, if
+the IP address of a host changes from 1.2.3.4 to 1.2.3.5 and 
+only_from is specified as 1.2.3.0 then access will not be denied.
+.IP 4.
+If the
+.B USERID
+log option is specified and the remote host either does not run an 
+identification server or the server sends back a bad reply,
+access will not be denied unless the
+.I IDONLY
+service flag is used.
+.IP 5.
+Interception works by forking a process which acts as a filter
+between the remote host(s) and the local server. 
+This obviously has a performance impact so
+it is up to you to make the compromise between security and performance
+for each service.
+The following tables show the overhead of interception.
+The first table shows the time overhead-per-datagram for a UDP-based service
+using various datagram sizes.
+For TCP-based services we measured the bandwidth reduction 
+because of interception while sending
+a certain amount of data from client to server (the time overhead should
+the same as for UDP-based services but it is "paid" only by the first
+packet of a continuous data transmission).
+The amount of data is given
+in the table as \fIsystem_calls\fPx\fIdata_sent_per_call\fP, i.e.
+each
+.I "send(2)"
+system call transferred so many bytes of data. 
+The bandwidth reduction is given in terms of bytes per second and as
+a percentage of the bandwidth when interception is not performed.
+All measurements were done on a SparcStation IPC running SunOS 4.1.
+.sp 1
+.RS
+.RS
+.PD .1v
+.TP 25
+Datagram size (bytes)
+Latency (msec)
+.TP
+---------------------
+--------------
+.TP
+64
+1.19
+.TP
+256
+1.51
+.TP
+1024
+1.51
+.TP
+4096
+3.58
+.sp 2
+.TP
+Bytes sent
+Bandwidth reduction
+.TP
+----------
+-------------------
+.TP
+10000x64
+941 (1.2%)
+.TP
+10000x256
+4,231 (1.8%)
+.TP
+10000x1024
+319,300 (39.5%)
+.TP
+10000x4096
+824,461 (62.1%)
+.RE
+.RE
+.sp 1
+.\" *********************** EXAMPLE ****************************
+.SH EXAMPLE
+.LP
+.PD .1v
+.RS
+.nf
+#
+# Sample configuration file for xinetd
+#
+
+defaults
+{
+.RS
+.IP log_type 20
+= FILE /var/log/servicelog
+.IP log_on_success
+= PID
+.IP log_on_failure 
+= HOST 
+.IP only_from
+= 128.138.193.0 128.138.204.0 
+.IP only_from
+= 128.138.252.1 
+.IP instances
+= 10
+.IP disabled
+= rstatd
+.RE
+}
+
+#
+# Note 1: the protocol attribute is not required
+# Note 2: the instances attribute overrides the default
+#
+service login
+{
+.RS
+.IP socket_type 20
+= stream
+.IP protocol
+= tcp
+.IP wait
+= no
+.IP user
+= root
+.IP server
+= /usr/etc/in.rlogind
+.IP instances
+= UNLIMITED
+.RE
+}
+
+#
+# Note 1: the instances attribute overrides the default
+# Note 2: the log_on_success flags are augmented
+#
+service shell
+{
+.RS
+.IP socket_type 20
+= stream
+.IP wait
+= no
+.IP user
+= root
+.IP instances
+= UNLIMITED
+.IP server
+= /usr/etc/in.rshd
+.IP log_on_success
++= HOST 
+.RE
+}
+
+service ftp
+{
+.RS
+.IP socket_type 20
+= stream
+.IP wait
+= no
+.IP nice
+= 10
+.IP user
+= root
+.IP server
+= /usr/etc/in.ftpd
+.IP server_args
+= -l
+.IP instances
+= 4
+.IP log_on_success
++= DURATION HOST USERID
+.IP access_times
+= 2:00-9:00 12:00-24:00
+.RE
+}
+
+# Limit telnet sessions to 8 Mbytes of memory and a total
+# 20 CPU seconds for child processes.
+service telnet
+{
+.RS
+.IP socket_type 20
+= stream
+.IP wait
+= no
+.IP nice
+= 10
+.IP user
+= root
+.IP server
+= /usr/etc/in.telnetd
+.IP rlimit_as
+= 8M
+.IP rlimit_cpu
+= 20
+.RE
+}
+
+#
+# This entry and the next one specify internal services. Since
+# this is the same service using a different socket type, the
+# id attribute is used to uniquely identify each entry
+#
+service echo
+{
+.RS
+.IP id 20
+= echo-stream
+.IP type
+= INTERNAL
+.IP socket_type
+= stream
+.IP user
+= root
+.IP wait
+= no
+.RE
+}
+
+service echo
+{
+.RS
+.IP id 20
+= echo-dgram
+.IP type
+= INTERNAL
+.IP socket_type
+= dgram
+.IP user
+= root
+.IP wait
+= no
+.RE
+}
+
+#
+# Sample RPC service
+#
+service rstatd
+{
+.RS
+.IP type 20
+= RPC
+.IP socket_type
+= dgram
+.IP protocol
+= udp
+.IP server
+= /usr/etc/rpc.rstatd
+.IP wait
+= yes
+.IP user
+= root
+.IP rpc_version
+= 2-4
+.IP env
+= LD_LIBRARY_PATH=/etc/securelib
+.RE
+}
+
+#
+# Sample unlisted service
+#
+service unlisted
+{
+.RS
+.IP type 20
+= UNLISTED
+.IP socket_type
+= stream
+.IP protocol
+= tcp
+.IP wait
+= no
+.IP server
+= /home/user/some_server
+.IP port
+= 20020
+.RE
+}
+.RE
+.PD
+.\" *********************** SEE ALSO ****************************
+.SH "SEE ALSO"
+.I "xinetd(1L),"
+.LP
+.I "xinetd.log(5)"
+.LP
+Postel J.,
+.IR "Echo Protocol" ,
+RFC 862,
+May 1983
+.LP
+Postel J.,
+.IR "Discard Protocol" ,
+RFC 863,
+May 1983
+.LP
+Postel J.,
+.IR "Character Generator Protocol" ,
+RFC 864,
+May 1983
+.LP
+Postel J.,
+.IR "Daytime Protocol" ,
+RFC 867,
+May 1983
+.LP
+Postel J., Harrenstien K.,
+.IR "Time Protocol" ,
+RFC 868,
+May 1983
+.LP
+M. Lottor,
+.IR "TCP Port Service Multiplexer (TCPMUX)" ,
+RFC 1078
+Nov 1988
+.LP
+StJohns M.,
+.IR " Identification Protocol" ,
+RFC 1413,
+February 1993
+.\" *********************** BUGS ****************************
+.SH BUGS
+.LP
+If the
+.B INTERCEPT
+flag is not used,
+access control on the address of the remote host is not performed when
+\fIwait\fP is \fIyes\fP and \fIsocket_type\fP is \fIstream\fP.
+.LP
+The NOLIBWRAP flag is automatically turned on for RPC services whose
+\fIsocket_type\fP is \fIstream\fP because xinetd cannot determine the
+address of the remote host.
+.LP
+If the 
+.B INTERCEPT
+flag is not used,
+access control on the address of the remote host for
+services where \fIwait\fP is \fIyes\fP and \fIsocket_type\fP is \fIdgram\fP
+is performed only on the first packet. The server may then accept packets
+from hosts not in the access control list. This can happen with 
+.B RPC
+services.
+.LP
+There is no way to put a
+.SM SPACE
+in an environment variable.
+.LP
+When \fIwait\fP is \fIyes\fP and \fIsocket_type\fP is \fIstream\fP,
+the socket passed to the server can only accept connections.
+.LP
+The
+.B INTERCEPT
+flag is not supported for internal services or multi-threaded services.
 
=== added file '.pc/000001-documentation_fixes/xinetd/xinetd.man'
--- .pc/000001-documentation_fixes/xinetd/xinetd.man	1970-01-01 00:00:00 +0000
+++ .pc/000001-documentation_fixes/xinetd/xinetd.man	2013-08-14 10:06:03 +0000
@@ -0,0 +1,194 @@
+.\"(c) Copyright 1992 by Panagiotis Tsirigotis
+.\"(c) Sections Copyright 1998-2001 by Rob Braun
+.\"All rights reserved.  The file named COPYRIGHT specifies the terms 
+.\"and conditions for redistribution.
+.\"
+.\" $Id: xinetd.man,v 1.3 2003-05-30 15:10:57 steveg Exp $
+.TH XINETD 8 "14 June 2001"
+.\" *************************** NAME *********************************
+.SH NAME
+xinetd \- the extended Internet services daemon
+.\" *************************** SYNOPSIS *********************************
+.SH SYNOPSIS
+.B xinetd
+[\fIoptions\fP]
+.\" *************************** DESCRIPTION *********************************
+.SH DESCRIPTION
+\fBxinetd\fP performs the same function as \fBinetd\fP: it starts
+programs that provide Internet services.  Instead of having such
+servers started at system initialization time, and be dormant until a
+connection request arrives, \fBxinetd\fP is the only daemon process
+started and it listens on all service ports for the services listed in
+its configuration file. When a request comes in, \fBxinetd\fP starts
+the appropriate server.  Because of the way it operates, \fBxinetd\fP
+(as well as \fBinetd\fP) is also referred to as a super-server.
+.LP
+The services listed in \fBxinetd\fP's configuration file can be
+separated into two groups.  Services in the first group are called
+.I "multi-threaded"
+and they require the forking of a new server process for each new
+connection request.  The new server then handles that connection.  For
+such services, \fBxinetd\fP keeps listening for new requests so that it
+can spawn new servers.  On the other hand, the second group includes
+services for which the service daemon is responsible for handling all
+new connection requests.  Such services are called
+.I "single-threaded"
+and \fBxinetd\fP will stop handling new requests for them until the
+server dies.  Services in this group are usually datagram-based.
+.LP
+So far, the only reason for the existence of a super-server was to
+conserve system resources by avoiding to fork a lot of processes which
+might be dormant for most of their lifetime.  While fulfilling this
+function, \fBxinetd\fP takes advantage of the idea of a super-server to
+provide features such as access control and logging.  Furthermore,
+\fBxinetd\fP is not limited to services listed in
+.I /etc/services.
+Therefore, anybody can use \fBxinetd\fP to start special-purpose
+servers.
+.\" *************************** OPTIONS *********************************
+.SH OPTIONS
+.TP
+.BR \-d
+Enables debug mode. This produces a lot of debugging output, and it
+makes it possible to use a debugger on \fBxinetd\fP.
+.TP
+.BI \-syslog " syslog_facility"
+This option enables syslog logging of \fBxinetd\fP-produced messages
+using the specified syslog facility.
+The following facility names are supported:
+.I daemon,
+.I auth,
+.I user,
+.I "local[0-7]"
+(check \fIsyslog.conf(5)\fP for their meanings).
+This option is ineffective in debug mode since all relevant messages are sent
+to the terminal.
+.TP
+.BI \-filelog " logfile"
+\fBxinetd\fP-produced messages will be placed in the specified file.
+Messages are always appended to the file.
+If the file does not exist, it will be created.
+This option is ineffective in debug mode since all relevant messages are sent
+to the terminal.
+.TP
+.BI \-f " config_file"
+Determines the file that \fBxinetd\fP uses for configuration. The
+default is \fI/etc/xinetd.conf\fP.
+.TP
+.BR \-pidfile " pid_file"
+.br
+The process ID is written to the file. This option is ineffective in debug mode. 
+.TP
+.BI \-dontfork 
+Tells xinetd to stay in the foreground rather than detaching itself, to
+support being run from init or daemontools. This option automatically sets 
+.B \-stayalive
+(see below).
+.TP
+.BI \-stayalive 
+Tells xinetd to stay running even if no services are specified.
+.TP
+.BI \-limit " proc_limit"
+This option places a limit on the number of concurrently running processes
+that can be started by
+.B xinetd.
+Its purpose is to prevent process table overflows.
+.TP
+.BI \-logprocs " limit"
+This option places a limit on the number of concurrently running servers
+for remote userid acquisition.
+.TP
+.BI \-version
+This option causes xinetd to print out its version information.
+.TP
+.BI \-inetd_compat
+This option causes xinetd to read /etc/inetd.conf in addition to the
+standard xinetd config files.  /etc/inetd.conf is read after the
+standard xinetd config files.
+.TP
+.BI \-cc " interval"
+This option instructs
+.B xinetd
+to perform periodic consistency checks on its internal state every
+.I interval
+seconds.
+.LP
+The \fIsyslog\fP and \fIfilelog\fP options are mutually exclusive.
+If none is specified, the default is syslog using the
+.I daemon
+facility.
+You should not confuse \fBxinetd\fP messages with messages related to
+service logging. The latter are logged only if this is specified
+via the configuration file.
+.\" *********************** CONTROLLING XINETD ****************************
+.SH "CONTROLLING XINETD"
+.LP
+\fBxinetd\fP performs certain actions when it receives certain signals.
+The actions associated with the specific signals can be redefined
+by editing \fIconfig.h\fP and recompiling.
+.TP 15
+.B SIGHUP
+causes a hard reconfiguration, which means that \fBxinetd\fP re-reads 
+the configuration file and terminates the servers for services that 
+are no longer available. Access control is performed again on 
+running servers by checking the remote location, access times and 
+server instances. If the number of server instances is lowered, some 
+arbitrarily picked servers will be killed to satisfy the limit; this 
+will happen \fIafter\fP any servers are terminated because of failing 
+the remote location or access time checks.
+Also, if the
+.B INTERCEPT
+flag was clear and is set, any running servers for that service will
+be terminated;
+\fIthe purpose of this is to ensure that after a hard reconfiguration
+there will be no running servers that can accept packets from addresses
+that do not meet the access control criteria\fP.
+.TP
+.B SIGQUIT
+causes program termination.
+.TP
+.B SIGTERM
+terminates all running servers before terminating \fBxinetd\fP.
+.TP
+.B SIGUSR1
+causes an internal state dump (the default dump file is
+\fI/var/run/xinetd.dump\fP;
+to change the filename, edit \fIconfig.h\fP and recompile).
+.TP
+.B SIGIOT
+causes an internal consistency check to verify that the data structures
+used by the program have not been corrupted.
+When the check is completed
+.B xinetd
+will generate a message that says if the check was successful or not.
+.LP
+On reconfiguration the log files are closed and reopened. This allows
+removal of old log files.
+.\" *********************** FILES ****************************
+.SH FILES
+.LP
+.PD .1v
+.TP 20
+.B /etc/xinetd.conf
+default configuration file
+.TP
+.B /var/run/xinetd.dump
+default dump file
+.PD
+.\" *********************** SEE ALSO ****************************
+.SH "SEE ALSO"
+.I "inetd(8),"
+.LP
+.I "xinetd.conf(5),"
+.LP
+.I "xinetd.log(5)"
+.LP
+.I "http://cr.yp.to/daemontools.html"
+.\" *********************** AUTHOR ****************************
+.SH AUTHOR
+Panos Tsirigotis, CS Dept, University of Colorado, Boulder
+Rob Braun
+.\" *********************** PRONUNCIATION ****************************
+.SH PRONUNCIATION
+zy-net-d
+
 
=== added directory '.pc/000004-Fix-xinetd.log.man-installation-path'
=== added file '.pc/000004-Fix-xinetd.log.man-installation-path/.timestamp'
=== added file '.pc/000004-Fix-xinetd.log.man-installation-path/Makefile.in'
--- .pc/000004-Fix-xinetd.log.man-installation-path/Makefile.in	1970-01-01 00:00:00 +0000
+++ .pc/000004-Fix-xinetd.log.man-installation-path/Makefile.in	2013-08-14 10:06:03 +0000
@@ -0,0 +1,123 @@
+CC = @CC@
+
+INSTALL_CMD = @INSTALL@
+
+RANLIB = @RANLIB@
+SRCDIR = @srcdir@
+VPATH = @srcdir@
+
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+DAEMONDIR = @sbindir@
+MANDIR = @mandir@
+topdir = @top_srcdir@
+
+LIBS = -lsio -lstr -lmisc -lxlog -lportable -lpset @LIBS@
+
+CFLAGS += @CFLAGS@ 
+DCFLAGS = -Wall -Wredundant-decls -W -Wfloat-equal -Wundef -Wcast-qual -Wwrite-strings -Wmissing-noreturn -Wmissing-format-attribute -Wshadow -Wpointer-arith -Wno-unused -g
+
+
+DEFS = @DEFS@
+
+SIO_DEFS  = @DEFS@
+MISC_DEFS = @DEFS@
+LIB_DEFS = @DEFS@ 
+PROG_DEFS = @DEFS@
+
+LIBMAKEDEFS = CC='$(CC)' CFLAGS='$(CFLAGS) -I../../include'
+PROGMAKEDEFS = CC='$(CC)' CFLAGS='$(CFLAGS) -I../libs/include' LDFLAGS='$(LDFLAGS) -L../libs/lib'
+DEBUGLIBMAKEDEFS = CC='$(CC)' CFLAGS='$(DCFLAGS) -I../../include'
+DEBUGMAKEDEFS = CC='$(CC)' CFLAGS='$(DCFLAGS) -I../libs/include' LDFLAGS='$(LDFLAGS) -L../libs/lib'
+
+MANDATORY_LIBS	= portable sio str misc xlog pset 
+ALL_LIBS	= portable sio str misc xlog pset 
+
+build: makelibs makeprog
+
+debug: debugmakelibs debugmakeprog
+
+makeprog: makelibs
+	cd xinetd ; $(MAKE) $(PROGMAKEDEFS)
+
+debugmakeprog:
+	cd xinetd ; $(MAKE) $(DEBUGMAKEDEFS)
+
+makelibs: libmisc libportable libpset libsio libstr libxlog
+
+debugmakelibs: dlibmisc dlibportable dlibpset dlibsio dlibstr dlibxlog
+
+libmisc: libstr
+	cd libs/src/misc ; $(MAKE) $(LIBMAKEDEFS) install
+libportable:
+	cd libs/src/portable ; $(MAKE) $(LIBMAKEDEFS) install
+libpset:
+	cd libs/src/pset ; $(MAKE) $(LIBMAKEDEFS) install
+libsio: libportable
+	cd libs/src/sio ; $(MAKE) $(LIBMAKEDEFS) install
+libstr: libsio
+	cd libs/src/str ; $(MAKE) $(LIBMAKEDEFS) install
+libxlog: libsio libstr
+	cd libs/src/xlog ; $(MAKE) $(LIBMAKEDEFS) install
+
+dlibmisc: dlibstr
+	cd libs/src/misc ; $(MAKE) $(DEBUGLIBMAKEDEFS) install
+dlibportable:
+	cd libs/src/portable ; $(MAKE) $(DEBUGLIBMAKEDEFS) install
+dlibpset:
+	cd libs/src/pset ; $(MAKE) $(DEBUGLIBMAKEDEFS) install
+dlibsio: dlibportable
+	cd libs/src/sio ; $(MAKE) $(DEBUGLIBMAKEDEFS) install
+dlibstr: dlibsio
+	cd libs/src/str ; $(MAKE) $(DEBUGLIBMAKEDEFS) install
+dlibxlog: dlibsio dlibstr
+	cd libs/src/xlog ; $(MAKE) $(DEBUGLIBMAKEDEFS) install
+
+install: build
+	for i in $(DAEMONDIR) $(BINDIR) $(MANDIR)/man5 $(MANDIR)/man8 ; do \
+	   test -d $$i || mkdir -p $$i ; done
+	$(INSTALL_CMD) -m 755 xinetd/xinetd $(DAEMONDIR)
+	$(INSTALL_CMD) -m 755 xinetd/itox $(DAEMONDIR)
+	$(INSTALL_CMD) -m 755 $(SRCDIR)/xinetd/xconv.pl $(DAEMONDIR)
+	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.conf.man $(MANDIR)/man5/xinetd.conf.5
+	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.log.man $(MANDIR)/man8/xinetd.log.8
+	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.man $(MANDIR)/man8/xinetd.8
+	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/itox.8 $(MANDIR)/man8/itox.8
+	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xconv.pl.8 $(MANDIR)/man8/xconv.pl.8
+	@echo "You must put your xinetd.conf in /etc/xinetd.conf"
+	@echo "There is a sample config file in xinetd/sample.conf and you can"
+	@echo "use xconv.pl to convert your old inetd.conf file to an xinetd format"
+
+uninstall:
+	rm -f $(DAEMONDIR)/xinetd
+	rm -f $(DAEMONDIR)/itox
+	rm -f $(DAEMONDIR)/xconv.pl
+	rm -f $(MANDIR)/man5/xinetd.conf.5
+	rm -f $(MANDIR)/man8/xinetd.log.8
+	rm -f $(MANDIR)/man8/xinetd.8
+	rm -f $(MANDIR)/man8/itox.8
+ 
+distclean: clean
+	rm -f config.cache config.log Makefile config.status xinetd/itox
+	rm -f config.h @srcdir@/libs/include/* @srcdir@/libs/man/*
+	for lib in $(ALL_LIBS) ; do \
+		cd @srcdir@/libs/src/$$lib ; $(MAKE) distclean ; \
+		cd ../../.. ; \
+	done
+	cd xinetd ; $(MAKE) distclean
+
+clean: cleanlibs cleanprog 
+	rm -f @srcdir@/libs/lib/*.a 
+
+cleanlibs:
+	for lib in $(ALL_LIBS) ; do \
+		cd @srcdir@/libs/src/$$lib ; $(MAKE) clean ; \
+		cd ../../.. ; \
+	done
+
+cleanprog:
+	cd xinetd ; $(MAKE) clean
+
+spotless: clean
+	rm -f @srcdir@/libs/include/*.h @srcdir@/libs/man/*.3
+	cd libs ; for i in lib include man ; do rm $$i/* ; done
 
=== added directory '.pc/000008-fix-manpages'
=== added file '.pc/000008-fix-manpages/.timestamp'
=== added directory '.pc/000008-fix-manpages/xinetd'
=== added file '.pc/000008-fix-manpages/xinetd/itox.8'
--- .pc/000008-fix-manpages/xinetd/itox.8	1970-01-01 00:00:00 +0000
+++ .pc/000008-fix-manpages/xinetd/itox.8	2013-08-14 10:06:03 +0000
@@ -0,0 +1,22 @@
+.TH ITOX 8 "March 2005" "xinetd"
+.SH NAME
+itox \- converts inetd.conf style configuration files to xinetd.conf
+.SH SYNOPSIS
+itox [-daemon_dir <dir_name>]
+.SH DESCRIPTION
+.B itox
+takes on its standard input inetd.conf style entries and dumps to
+standard output the corresponding xinetd.conf style entries.
+.SH OPTIONS
+.TP
+.I -daemon_dir <dir_name>
+If you use tcpd, this option specifies the directory where all the daemons are.
+You must specify this option if you use tcpd and the daemon file names are not
+absolute.
+.SH EXAMPLES
+itox -daemon_dir /usr/sbin < inetd.conf > xinetd.conf
+.SH AUTHOR
+xinetd and itox were written by Panagiotis Tsirigotis.
+.sp
+This man page was written by Norbert Veber <[e-mail]> and Thomas Seyrat
+<[e-mail]>
 
=== added file '.pc/000008-fix-manpages/xinetd/xinetd.conf.man'
--- .pc/000008-fix-manpages/xinetd/xinetd.conf.man	1970-01-01 00:00:00 +0000
+++ .pc/000008-fix-manpages/xinetd/xinetd.conf.man	2013-08-14 10:06:03 +0000
@@ -0,0 +1,1253 @@
+.\"(c) Copyright 1992, by Panagiotis Tsirigotis
+.\"(c) Sections Copyright 1998-2001 by Rob Braun
+.\"All rights reserved.  The file named COPYRIGHT specifies the terms 
+.\"and conditions for redistribution.
+.\"
+.\" $Id: xinetd.conf.man,v 1.20 2007-09-20 14:58:27 bbraun Exp $
+.TH XINETD.CONF 5 "14 June 2001"
+.\" *************************** NAME *********************************
+.SH NAME
+xinetd.conf \- Extended Internet Services Daemon configuration file
+.\" *********************** DESCRIPTION ****************************
+.SH DESCRIPTION
+.B "xinetd.conf"
+is the configuration file that
+determines the services provided by \fBxinetd\fP.
+Any line whose first non-white-space character is a '#' is considered
+a comment line. Empty lines are ignored.
+.LP
+The file contains entries of the form:
+.RS
+.nf
+.ft B
+.sp
+service <service_name>
+{
+.RS
+.ft B
+<attribute> <assign_op> <value> <value> ...
+.I "..."
+.RE
+}
+.ft R
+.fi
+.RE
+.LP
+The assignment operator,
+.I assign_op,
+can be one of 
+.B '=', 
+.B '+=',
+.B '-='.
+The majority of attributes support only the simple assignment operator,
+.B '='.
+Attributes whose value is a set of values support all assignment operators.
+For such attributes,
+.B '+=' 
+means adding a value to the set and 
+.B '-='
+means removing a value from the set.
+A list of these attributes will be given
+after all the attributes are described.
+.LP
+Each entry defines a service identified by the \fIservice_name\fP.
+The following is a list of available attributes:
+.TP 17
+.B id
+This attribute is used to uniquely identify a service.
+This is useful because there exist services that can use different 
+protocols and need to be described with different entries in the
+configuration file.
+By default, the service id is the same as the service name.
+.TP
+.B type
+Any combination of the following values may be used:
+.RS
+.TP 12
+.B RPC
+if this is an RPC service
+.TP
+.B INTERNAL
+if this is a service provided by \fBxinetd\fP.
+.TP
+.B TCPMUX/TCPMUXPLUS
+if this is a service that will be started according to the RFC 1078 protocol on the TCPMUX well-known port. See the section describing TCPMUX services below.
+.TP
+.B UNLISTED
+if this is a service not listed in a standard system file
+(like
+.I /etc/rpc 
+for RPC services, or
+.I /etc/services
+for non-RPC services).
+.RE
+.TP
+.B flags
+Any combination of the following flags may be used:
+.RS
+.TP 12
+.B INTERCEPT
+Intercept packets or accepted connections in order to verify that they
+are coming from acceptable locations (internal or multi-threaded
+services cannot be intercepted).
+.TP
+.B NORETRY
+Avoid retry attempts in case of fork failure.
+.TP
+.B IDONLY
+Accept connections only when the remote end identifies the remote user
+(i.e. the remote host must run an identification server).
+This flag applies only to connection-based services.
+This flag is ineffective if the
+.B USERID
+log option is not used.
+.TP
+.B NAMEINARGS
+This will cause the first argument in "server_args" to be argv[0] when
+executing the server, as specified in "server".  This allows you to use
+tcpd by putting tcpd in "server" and the name of the server in "server_args"
+like in normal inetd.
+.TP
+.B NODELAY
+If the service is a tcp service and the NODELAY flag is set, then the
+TCP_NODELAY flag will be set on the socket.  If the service is not
+a tcp service, this option has no effect.
+.TP
+.B KEEPALIVE
+If the service is a tcp service and the KEEPALIVE flag is set, then 
+the SO_KEEPALIVE socket flag will be set on the socket.  If the service
+is not a tcp service, this option has no effect.
+.TP
+.B NOLIBWRAP
+This disables internal calling of the tcpwrap library to determine access
+to the service.  This may be needed in order to use libwrap functionality
+not available to long-running processes such as xinetd; in this case,
+the tcpd program can be called explicitly (see also the NAMEINARGS flag).
+For RPC services using TCP transport, this flag is automatically turned on,
+because xinetd cannot get remote host address information for the rpc port.
+.TP
+.B SENSOR
+This replaces the service with a sensor that detects accesses to the 
+specified port. NOTE: It will NOT detect stealth scans. This flag 
+should be used only on services that you know you don't need. When an 
+access is made to this service's port, the IP Address is added to a global
+no_access list. This causes all subsequent accesses from the originating IP
+address to be denied access until the deny_time setting expires. The amount
+of time spent on this list is configurable as the deny_time attribute. The
+SENSOR flag will also cause xinetd to consider the server attribute to be
+INTERNAL no matter what is typed on the same line. Another important thing
+to remember is that if the socket_type is set to stream, then the wait 
+attribute should be set to no.
+.TP
+.B IPv4
+Sets the service to be an IPv4 service (AF_INET).
+.TP
+.B IPv6
+Sets the service to be an IPv6 service (AF_INET6), if IPv6 is available on the system.
+.TP
+.B LABELED
+The LABELED flag will tell xinetd to change the child processes SE Linux context to match that of the incoming connection as it starts the service. This only works for external tcp non-waiting servers and is an error if applied to an internal, udp, or tcp-wait server.
+.TP
+.B REUSE
+The REUSE flag is deprecated.  All services now implicitly use the REUSE flag.
+.RE
+.TP
+.B disable
+This is boolean "yes" or "no".  This will result in the service
+being disabled and not starting.  See the DISABLE flag description.
+.RE
+.TP
+.B socket_type
+Possible values for this attribute include:
+.RS
+.TP 12
+.I stream
+stream-based service
+.TP
+.I dgram
+datagram-based service
+.TP
+.I raw
+service that requires direct access to IP
+.TP
+.I seqpacket
+service that requires reliable sequential datagram transmission
+.RE
+.TP
+.B protocol
+determines the protocol that is employed by the service.
+The protocol must exist in
+.I /etc/protocols.
+If this
+attribute is not defined, the default protocol employed by the service
+will be used.
+.TP
+.B wait
+This attribute determines if the service is single-threaded or
+multi-threaded and whether or not xinetd accepts the connection or the server
+program accepts the connection. If its value is \fIyes\fP, the service is 
+single-threaded; this means that \fBxinetd\fP will start the server and then 
+it will stop handling requests for the service until the server dies and that
+the server software will accept the connection. If the attribute value is 
+\fIno\fP, the service is multi-threaded and \fBxinetd\fP will keep handling 
+new service requests and xinetd will accept the connection. It should be noted 
+that udp/dgram services normally expect the value to be yes since udp is not
+connection oriented, while tcp/stream servers normally expect the value to be
+no.
+.TP
+.B user
+determines the uid for the server process. The user attribute can either 
+be numeric or a name. If a name is given (recommended),  the user name must 
+exist in
+.I /etc/passwd.
+This attribute is ineffective if the effective user ID 
+of \fBxinetd\fP is not super-user.
+.TP
+.B group
+determines the gid for the server process. The group attribute can either
+be numeric or a name. If a name is given (recommended), the group name must 
+exist in
+.I /etc/group.
+If a group is not specified, the group
+of \fIuser\fP will be used (from 
+.I /etc/passwd).
+This attribute is ineffective if the effective user ID 
+of \fBxinetd\fP is not super-user and if the \fBgroups\fP attribute
+is not set to 'yes'.
+.TP
+.B instances
+determines the number of servers that can be simultaneously active
+for a service (the default is no limit). The value of this
+attribute can be either a number or
+.B UNLIMITED
+which means that there is no limit.
+.TP
+.B nice
+determines the server priority. Its value is a (possibly negative) number;
+check nice(3) for more information.
+.TP
+.B server
+determines the program to execute for this service.
+.TP
+.B server_args
+determines the arguments passed to the server. In contrast to \fBinetd\fP,
+the server name should \fInot\fP be included in \fIserver_args\fP.
+.TP
+.B libwrap
+overrides the service name passed to libwrap (which defaults to the
+server name, the first server_args component with NAMEINARGS, the id
+for internal services and the service name for redirected services).
+This attribute is only valid if xinetd has been configured with the libwrap
+option.
+.TP
+.B only_from
+determines the remote hosts to which the particular
+service is available.
+Its value is a list of IP addresses which can be specified in any
+combination of the following ways:
+.RS
+.TP 5
+.B a)
+a numeric address in the form of %d.%d.%d.%d. If the rightmost components are 
+0, they are treated as wildcards 
+(for example, 128.138.12.0 matches all hosts on the 128.138.12 subnet).
+0.0.0.0 matches all Internet addresses.  IPv6 hosts may be specified in the form of abcd:ef01::2345:6789.  The rightmost rule for IPv4 addresses does not apply to IPv6 addresses.
+.TP
+.B b)
+a factorized address in the form of %d.%d.%d.{%d,%d,...}.
+There is no need for all 4 components (i.e. %d.%d.{%d,%d,...%d} is also ok).
+However, the factorized part must be at the end of the address.  This form does not work for IPv6 hosts.
+.TP
+.B c)
+a network name (from
+.I /etc/networks).  This form does not work for IPv6 hosts.
+.TP
+.B d)
+a host name.  When a connection is made to xinetd, a reverse lookup is
+performed, and the canonical name returned is compared to the specified host
+name.  You may also use domain names in the form of .domain.com.  If the
+reverse lookup of the client's IP is within .domain.com, a match occurs.
+.TP
+.B e)
+an ip address/netmask range in the form of 1.2.3.4/32.  IPv6 address/netmask
+ranges in the form of 1234::/46 are also valid.
+.RE
+.TP
+.B ""
+Specifying this attribute
+without a value makes the service available to nobody.
+.TP
+.B no_access
+determines the remote hosts to which the particular
+service is unavailable. Its value can be specified in the same way as the
+value of the \fBonly_from\fP
+attribute. These two attributes determine the location access control 
+enforced by \fBxinetd\fP. If none of the two is specified for a service,
+the service is available to anyone. If both are specified for a service,
+the one that is the better match for
+the address of the remote host determines
+if the service is available to that host (for example, if the 
+\fBonly_from\fP list contains 128.138.209.0 and the
+\fBno_access\fP list contains 128.138.209.10
+then the host with the address 128.138.209.10 can not access the service).
+.TP
+.B access_times
+determines the time intervals when the service is available. An interval
+has the form \fIhour:min-hour:min\fP (connections 
+.I will 
+be accepted at the bounds of an interval). Hours can range from 0 to 23 and
+minutes from 0 to 59.
+.TP
+.B log_type
+determines where the service log output is sent. There are two formats:
+.RS
+.TP
+.B SYSLOG " \fIsyslog_facility [syslog_level]\fP"
+The log output is sent to syslog at the specified facility. Possible facility
+names include:
+.I daemon,
+.I auth,
+.I authpriv,
+.I user,
+.I mail,
+.I lpr,
+.I news,
+.I uucp,
+.I ftp
+.I "local0-7."
+Possible level names include:
+.I emerg,
+.I alert,
+.I crit,
+.I err,
+.I warning,
+.I notice,
+.I info,
+.I debug.
+If a level is not present, the messages will be recorded at the
+.I info
+level.
+.TP
+.B FILE " \fIfile [soft_limit [hard_limit]]\fP"
+The log output is appended to \fIfile\fP which will be created if it does
+not exist. Two limits on the size of the log file can be optionally specified.
+The first limit is a soft one;
+.B xinetd 
+will log a message the first time this limit is exceeded (if 
+.B xinetd
+logs to syslog, the message will be sent at the 
+.I alert
+priority level).
+The second limit is a hard limit; 
+.B xinetd 
+will stop logging for the affected service (if the log file is a
+common log file, then more than one service may be affected)
+and will log a message about this (if
+.B xinetd
+logs to syslog, the message will be sent at the 
+.I alert
+priority level).
+If a hard limit is not specified, it defaults to the soft limit
+increased by 1% but the extra size must be within the parameters
+.SM LOG_EXTRA_MIN
+and
+.SM LOG_EXTRA_MAX
+which default to 5K and 20K respectively (these constants are defined in 
+\fIxconfig.h\fP).
+.RE
+.TP
+.B log_on_success
+determines what information is logged when a server is started and when
+that server exits (the service id is always included in the log entry).
+Any combination of the following values may be specified:
+.RS
+.TP 12
+.B PID
+logs the server process id (if the service is implemented by \fBxinetd\fP
+without forking another process the logged process id will be 0)
+.TP
+.B HOST
+logs the remote host address
+.TP
+.B USERID
+logs the user id of the remote user using the RFC 1413 identification protocol.
+This option is available only for multi-threaded stream services.
+.TP
+.B EXIT
+logs the fact that a server exited along with the exit status or the
+termination signal
+(the process id is also logged if the
+.B PID
+option is used)
+.TP
+.B DURATION 
+logs the duration of a service session
+.TP
+.B TRAFFIC
+logs the total bytes in and out for a redirected service.
+.RE
+.TP
+.B log_on_failure
+determines what information is logged when a server cannot be started
+(either because of a lack of resources or because of access control
+restrictions). The service id is always included in the log entry along
+with the reason for failure.
+Any combination of the following values may be specified:
+.RS
+.TP 12
+.B HOST
+logs the remote host address.
+.TP
+.B USERID
+logs the user id of the remote user using the RFC 1413 identification protocol.
+This option is available only for multi-threaded stream services.
+.TP 
+.B ATTEMPT
+logs the fact that a failed attempt was made
+(this option is implied by all others).
+.RE
+.TP
+.B rpc_version
+determines the RPC version for a RPC service. The version can be
+a single number or a range in the form \fInumber\fP-\fInumber\fP.
+.TP
+.B rpc_number
+determines the number for an
+.I UNLISTED
+RPC service (this attribute is ignored if the service is not unlisted).
+.TP
+.B env
+The value of this attribute is a list of strings of the form 'name=value'.
+These strings will be added to the environment before
+starting a server (therefore the server's environment will include
+\fBxinetd\fP's environment plus the specified strings).
+.TP
+.B passenv
+The value of this attribute is a list of environment variables from
+\fBxinetd\fP's environment that will be passed to the server.
+An empty list implies passing no variables to the server
+except for those explicitly defined using the
+.I env
+attribute.
+(notice that you can use this attribute in conjunction with the
+.I env
+attribute to specify exactly what environment will be passed to the server).
+.TP
+.B port
+determines the service port. If this attribute is specified for a service 
+listed in
+.I /etc/services,
+it must be equal to the port number listed in that file.
+.TP
+.B redirect
+Allows a tcp service to be redirected to another host.  When xinetd receives
+a tcp connection on this port it spawns a process that establishes a
+connection to the host and port number specified, and forwards all data
+between the two hosts.  This option is useful when your internal machines
+are not visible to the outside world.  Syntax is: redirect = (ip address) 
+(port).  You can also use a hostname instead of the IP address in this
+field.  The hostname lookup is performed only once, when xinetd is 
+started, and the first IP address returned is the one that is used
+until xinetd is restarted.
+The "server" attribute is not required when this option is specified.  If
+the "server" attribute is specified, this attribute takes priority.
+.TP
+.B bind
+Allows a service to be bound to a specific interface on the machine.
+This means you can have a telnet server listening on a local, secured
+interface, and not on the external interface.  Or one port on one interface
+can do something, while the same port on a different interface can do 
+something completely different.  Syntax: bind = (ip address of interface).
+.TP
+.B interface
+Synonym for bind.
+.TP
+.B banner
+Takes the name of a file to be splatted at the remote host when a 
+connection to that service is established.  This banner is printed
+regardless of access control.  It should *always* be printed when
+a connection has been made.  \fBxinetd\fP outputs the file as-is,
+so you must ensure the file is correctly formatted for the service's
+protocol.  In paticular, if the protocol requires CR-LF pairs for line
+termination, you must supply them.
+.TP
+.B banner_success
+Takes the name of a file to be splatted at the remote host when a
+connection to that service is granted.  This banner is printed
+as soon as access is granted for the service.  \fBxinetd\fP outputs the
+file as-is, so you must ensure the file is correctly formatted for
+the service's protocol.  In paticular, if the protocol requires CR-LF
+pairs for line termination, you must supply them.
+.TP
+.B banner_fail
+Takes the name of a file to be splatted at the remote host when a
+connection to that service is denied.  This banner is printed 
+immediately upon denial of access.  This is useful for informing
+your users that they are doing something bad and they shouldn't be
+doing it anymore.  \fBxinetd\fP outputs the file as-is,
+so you must ensure the file is correctly formatted for the service's
+protocol.  In paticular, if the protocol requires CR-LF pairs for line
+termination, you must supply them.
+.TP
+.B per_source
+Takes an integer or "UNLIMITED" as an argument.  This specifies the
+maximum instances of this service per source IP address.  This can
+also be specified in the defaults section.
+.TP
+.B cps
+Limits the rate of incoming connections.  Takes two arguments.  
+The first argument is the number of connections per second to handle.
+If the rate of incoming connections is higher than this, the service
+will be temporarily disabled.  The second argument is the number of
+seconds to wait before re-enabling the service after it has been disabled.
+The default for this setting is 50 incoming connections and the interval
+is 10 seconds.
+.TP
+.B max_load
+Takes a floating point value as the load at which the service will 
+stop accepting connections.  For example: 2 or 2.5.  The service
+will stop accepting connections at this load.  This is the one minute
+load average.  This is an OS dependent feature, and currently only
+Linux, Solaris, and FreeBSD are supported for this.  This feature is
+only avaliable if xinetd was configured with the -with-loadavg option.
+.TP
+.B groups
+Takes either "yes" or "no".  If the groups attribute is set to
+"yes", then the server is executed with access to the groups that the
+server's effective UID has access to.  Alternatively, if the \fBgroup\fP
+attribute is set, the server is executed with access to the groups
+specified.  If the groups attribute is set 
+to "no", then the server runs with no supplementary groups.  This
+attribute must be set to "yes" for many BSD systems.  This attribute
+can be set in the defaults section as well.
+.TP
+.B mdns
+Takes either "yes" or "no".  On systems that support mdns registration
+of services (currently only Mac OS X), this will enable or disable
+registration of the service.  This defaults to "yes".
+.TP
+.B umask
+Sets the inherited umask for the service.  Expects an octal value.  
+This option may be set in the "defaults" section to set a umask
+for all services.  xinetd sets its own umask to the previous umask
+OR'd with 022.  This is the umask that will be inherited by all 
+child processes if the umask option is not used.
+.TP
+.B enabled
+Takes a list of service ID's to enable.  This will enable only the
+services listed as arguments to this attribute; the rest will be
+disabled.  If you have 2 ftp services, you will need to list both of
+their ID's and not just ftp. (ftp is the service name, not the ID. It
+might accidentally be the ID, but you better check.) Note that the 
+service "disable" attribute and "DISABLE" flag can prevent a service 
+from being enabled despite being listed in this attribute. 
+.TP
+.B include
+Takes a filename in the form of "include /etc/xinetd/service".
+The file is then parsed as a new configuration file.  It is not 
+the same thing as pasting the file into xinetd.conf where the 
+include directive is given.  The included file must be in the 
+same form as xinetd.conf.  This may not be specified from within
+a service.  It must be specified outside a service declaration.
+.TP
+.B includedir
+Takes a directory name in the form of "includedir /etc/xinetd.d".
+Every file inside that directory, excluding files with names containing
+a dot ('.') or ending with a tilde ('~'), will be parsed as xinetd 
+configuration files.  The files will be parsed in alphabetical order
+according to the C locale. This allows you to specify services one 
+per file within a directory.  The
+.B includedir
+directive may not be specified from within a service declaration.  
+.TP
+.B rlimit_as
+Sets the Address Space resource limit for the service. One parameter
+is required, which is either a positive integer representing the number
+of bytes to set the limit to (K or M may be used to specify
+kilobytes/megabytes) or "UNLIMITED".  Due to the way Linux's libc malloc
+is implemented, it is more useful to set this limit than rlimit_data,
+rlimit_rss and rlimit_stack. This resource limit is only implemented on
+Linux systems.
+.TP
+.B rlimit_cpu
+Sets the maximum number of CPU seconds that the service may use.
+One parameter is required, which is either a positive integer representing
+the number of CPU seconds limit to, or "UNLIMITED".
+.TP
+.B rlimit_data
+Sets the maximum data size resource limit for the service.
+One parameter is required, which is either a positive integer representing
+the number of bytes or "UNLIMITED".
+.TP
+.B rlimit_rss
+Sets the maximum resident set size limit for the service.  Setting this
+value low will make the process a likely candidate for swapping out to
+disk when memory is low.
+One parameter is required, which is either a positive integer representing
+the number of bytes or "UNLIMITED".
+.TP
+.B rlimit_stack
+Set the maximum stack size limit for the service.
+One parameter is required, which is either a positive integer representing
+the number of bytes or "UNLIMITED".
+.TP
+.B deny_time
+Sets the time span that access to all services on all IP addresses are
+denied to someone that sets off the SENSOR. The unit of time is in minutes.
+Valid options are: FOREVER, NEVER, and a numeric value. FOREVER causes
+the IP address not to be purged until xinetd is restarted. NEVER has the
+effect of just logging the offending IP address. A typical time value would
+be 60 minutes. This should stop most DOS attacks while allowing IP addresses
+that come from a pool to be recycled for legitimate purposes. This option
+must be used in conjunction with the SENSOR flag.
+.LP
+You don't need to specify all of the above attributes for each service.
+The necessary attributes for a service are:
+.sp 1
+.PD .1v
+.RS
+.TP 18
+.B socket_type
+.TP
+.B user
+(non-\fIinternal\fP services only)
+.TP
+.B server
+(non-\fIinternal\fP services only)
+.TP
+.B wait
+.TP
+.B protocol
+(\fIRPC\fP and \fIunlisted\fP services only)
+.TP
+.B rpc_version
+(\fIRPC\fP services only)
+.TP
+.B rpc_number
+(\fIunlisted\fP RPC services only)
+.TP
+.B port
+(\fIunlisted\fP non-RPC services only)
+.RE
+.PD
+.LP
+The following attributes support all assignment operators:
+.sp 1
+.PD .1v
+.RS
+.TP 18
+.B only_from
+.TP
+.B no_access
+.TP
+.B log_on_success
+.TP
+.B log_on_failure
+.TP
+.B passenv
+.TP
+.B env
+(does not support the
+.B '-='
+operator)
+.RE
+.PD
+.LP
+These attributes can also appear more than once in a service entry.
+The remaining attributes support only the 
+.B '='
+operator and can appear at most once in a service entry.
+.LP
+The configuration file may also contain a single defaults entry
+that has the form
+.LP
+.RS
+.nf
+.ft B
+defaults
+{
+.RS
+.ft B
+<attribute> = <value> <value> ...
+.I "..."
+.RE
+.ft B
+}
+.ft R
+.fi
+.RE
+.LP
+This entry provides default attribute values for service entries that
+don't specify those attributes. Possible default attributes:
+.sp 1
+.PD .1v
+.RS
+.TP 18
+.B log_type
+(cumulative effect)
+.TP
+.B bind 
+.TP
+.B per_source 
+.TP
+.B umask 
+.TP
+.B log_on_success
+(cumulative effect)
+.TP
+.B log_on_failure
+(cumulative effect)
+.TP
+.B only_from
+(cumulative effect)
+.TP
+.B no_access
+(cumulative effect)
+.TP
+.B passenv
+(cumulative effect)
+.TP
+.B instances
+.TP
+.B disabled
+(cumulative effect)
+.TP
+.B enabled
+(cumulative effect)
+.TP
+.B banner 
+.TP
+.B banner_success 
+.TP
+.B banner_fail
+.TP
+.B per_source 
+.TP
+.B groups 
+.TP
+.B cps 
+.TP
+.B max_load 
+.TP
+.RE
+.PD
+.LP
+Attributes with a cumulative effect can be specified multiple times
+with the values specified each time accumulating (i.e. '=' does
+the same thing as '+=').
+With the exception of
+.I disabled
+they all have the same meaning as if they were specified in a service entry.
+.I disabled
+determines services that are disabled even if they have entries in
+the configuration file. This allows for quick reconfiguration by
+specifying disabled services with the
+.I disabled
+attribute instead of commenting them out.
+The value of this attribute is a list of space separated service ids.
+.I enabled 
+has the same properties as disabled.  The difference being that
+.I enabled 
+is a list of which services are to be enabled.  If 
+.I enabled 
+is specified, only the services specified are available.  If
+.I enabled 
+is not specified, all services are assumed to be enabled,
+except those listed in 
+.I disabled.
+
+.\" *********************** INTERNAL SERVICES ****************************
+.SH "INTERNAL SERVICES"
+.LP
+\fBxinetd\fP provides the following services internally (both
+stream and datagram based):
+.I echo,
+.I time,
+.I daytime,
+.I chargen,
+and
+.I discard.
+These services are under the same access restrictions as all other
+services except for the ones that don't require \fBxinetd\fP to fork
+another process for them. Those ones (\fItime\fP, \fIdaytime\fP,
+and the datagram-based \fIecho\fP, \fIchargen\fP, and \fIdiscard\fP) 
+have no limitation in the number of 
+.B instances.
+.LP
+.\" *********************** TCPMUX Services ****************************
+.SH "TCPMUX Services"
+.LP
+\fBxinetd\fP supports TCPMUX services that conform to RFC 1078. These services 
+may not have a well-known port associated with them, and can be accessed via 
+the TCPMUX well-known port.
+.LP
+For each service that is to be accessed via TCPMUX, a service entry in
+\fB/etc/xinetd.conf\fP or in a configuration file in an \fBincludedir\fP 
+directory must exist.
+.LP
+The \fIservice_name\fP field (as defined above for each service in any 
+\fBxinetd\fP 
+configuration file) must be identical to the string that is passed (according 
+to RFC 1078 protocol) to \fBxinetd\fP when the remote service requestor first 
+makes the connection on the TCPMUX well-known port.  Private protocols should 
+use a service name that has a high probability of being unique. One way is to 
+prepend the service name with some form of organization ID.
+.LP
+The \fItype\fP field can be either \fBTCPMUX\fP or \fBTCPMUXPLUS\fP. If the
+type is \fBTCPMUXPLUS\fP, \fBxinetd\fP will handle the initial protocol
+handshake (as defined in RFC 1078) with the calling process before initiating
+the service. If the type is \fBTCPMUX\fP, the server that is started is
+responsible for performing the handshake.
+.LP
+The \fItype\fP field should also include \fBUNLISTED\fP if the service is
+not listed in a standard system file
+(like
+.I /etc/rpc
+for RPC services, or
+.I /etc/services
+for non-RPC services).
+.LP	
+The \fIsocket_type\fP for these services must be \fBstream\fP, and the 
+\fIprotocol\fP must be \fBtcp\fP.
+.LP
+Following is a sample TCPMUX service configuration:
+.PD .1v
+.RS
+.nf
+
+service myorg_server
+{
+.RS
+.IP disable 20
+= no
+.IP type
+= TCPMUX
+.IP socket_type
+= stream
+.IP protocol
+= tcp
+.IP wait
+= no
+.IP user
+= root
+.IP server
+= /usr/etc/my_server_exec
+.RE
+}
+.fi
+.RE
+.PD
+.LP
+Besides a service entry for each service that can be accessed
+via the TCPMUX well-known port, a service entry for TCPMUX itself
+must also be included in the \fBxinetd\fP configuration. Consider the following
+sample:
+.PD .1v
+.RS
+.nf
+
+service tcpmux
+{
+.RS
+.IP type 20
+= INTERNAL
+.IP id
+= tcpmux
+.IP socket_type
+= stream
+.IP protocol
+= tcp
+.IP user
+= root
+.IP wait
+= no
+.RE
+}
+.fi
+.RE
+.PD                                                                               
+
+
+
+.\" *********************** NOTES ****************************
+.SH NOTES
+.IP 1. 4
+The following service attributes \fIcannot\fP be changed on reconfiguration:
+.B socket_type,
+.B wait,
+.B protocol,
+.B type.
+.IP 2.
+When the attributes
+.I only_from
+and
+.I no_access
+are not specified for a service (either directly or via \fIdefaults\fP)
+the address check is considered successful (i.e. access will not be
+denied).
+.IP 3.
+The address check is based on the IP address of the remote host and
+not on its domain address. We do this so that we can avoid
+remote name lookups which may take a long time (since
+.B xinetd
+is single-threaded, a name lookup will prevent the daemon from
+accepting any other requests until the lookup is resolved).
+The down side of this scheme is that if the IP address of a remote
+host changes, then access to that host may be denied until
+.B xinetd
+is reconfigured.
+Whether access is actually denied or not will depend on whether the
+new host IP address is among those allowed access. For example, if
+the IP address of a host changes from 1.2.3.4 to 1.2.3.5 and 
+only_from is specified as 1.2.3.0 then access will not be denied.
+.IP 4.
+If the
+.B USERID
+log option is specified and the remote host either does not run an 
+identification server or the server sends back a bad reply,
+access will not be denied unless the
+.I IDONLY
+service flag is used.
+.IP 5.
+Interception works by forking a process which acts as a filter
+between the remote host(s) and the local server. 
+This obviously has a performance impact so
+it is up to you to make the compromise between security and performance
+for each service.
+The following tables show the overhead of interception.
+The first table shows the time overhead-per-datagram for a UDP-based service
+using various datagram sizes.
+For TCP-based services we measured the bandwidth reduction 
+because of interception while sending
+a certain amount of data from client to server (the time overhead should
+the same as for UDP-based services but it is "paid" only by the first
+packet of a continuous data transmission).
+The amount of data is given
+in the table as \fIsystem_calls\fPx\fIdata_sent_per_call\fP, i.e.
+each
+.I "send(2)"
+system call transferred so many bytes of data. 
+The bandwidth reduction is given in terms of bytes per second and as
+a percentage of the bandwidth when interception is not performed.
+All measurements were done on a SparcStation IPC running SunOS 4.1.
+.sp 1
+.RS
+.RS
+.PD .1v
+.TP 25
+Datagram size (bytes)
+Latency (msec)
+.TP
+---------------------
+--------------
+.TP
+64
+1.19
+.TP
+256
+1.51
+.TP
+1024
+1.51
+.TP
+4096
+3.58
+.sp 2
+.TP
+Bytes sent
+Bandwidth reduction
+.TP
+----------
+-------------------
+.TP
+10000x64
+941 (1.2%)
+.TP
+10000x256
+4,231 (1.8%)
+.TP
+10000x1024
+319,300 (39.5%)
+.TP
+10000x4096
+824,461 (62.1%)
+.RE
+.RE
+.sp 1
+.\" *********************** EXAMPLE ****************************
+.SH EXAMPLE
+.LP
+.PD .1v
+.RS
+.nf
+#
+# Sample configuration file for xinetd
+#
+
+defaults
+{
+.RS
+.IP log_type 20
+= FILE /var/log/servicelog
+.IP log_on_success
+= PID
+.IP log_on_failure 
+= HOST 
+.IP only_from
+= 128.138.193.0 128.138.204.0 
+.IP only_from
+= 128.138.252.1 
+.IP instances
+= 10
+.IP disabled
+= rstatd
+.RE
+}
+
+#
+# Note 1: the protocol attribute is not required
+# Note 2: the instances attribute overrides the default
+#
+service login
+{
+.RS
+.IP socket_type 20
+= stream
+.IP protocol
+= tcp
+.IP wait
+= no
+.IP user
+= root
+.IP server
+= /usr/etc/in.rlogind
+.IP instances
+= UNLIMITED
+.RE
+}
+
+#
+# Note 1: the instances attribute overrides the default
+# Note 2: the log_on_success flags are augmented
+#
+service shell
+{
+.RS
+.IP socket_type 20
+= stream
+.IP wait
+= no
+.IP user
+= root
+.IP instances
+= UNLIMITED
+.IP server
+= /usr/etc/in.rshd
+.IP log_on_success
++= HOST 
+.RE
+}
+
+service ftp
+{
+.RS
+.IP socket_type 20
+= stream
+.IP wait
+= no
+.IP nice
+= 10
+.IP user
+= root
+.IP server
+= /usr/etc/in.ftpd
+.IP server_args
+= -l
+.IP instances
+= 4
+.IP log_on_success
++= DURATION HOST USERID
+.IP access_times
+= 2:00-9:00 12:00-24:00
+.RE
+}
+
+# Limit telnet sessions to 8 Mbytes of memory and a total
+# 20 CPU seconds for child processes.
+service telnet
+{
+.RS
+.IP socket_type 20
+= stream
+.IP wait
+= no
+.IP nice
+= 10
+.IP user
+= root
+.IP server
+= /usr/etc/in.telnetd
+.IP rlimit_as
+= 8M
+.IP rlimit_cpu
+= 20
+.RE
+}
+
+#
+# This entry and the next one specify internal services. Since
+# this is the same service using a different socket type, the
+# id attribute is used to uniquely identify each entry
+#
+service echo
+{
+.RS
+.IP id 20
+= echo-stream
+.IP type
+= INTERNAL
+.IP socket_type
+= stream
+.IP user
+= root
+.IP wait
+= no
+.RE
+}
+
+service echo
+{
+.RS
+.IP id 20
+= echo-dgram
+.IP type
+= INTERNAL
+.IP socket_type
+= dgram
+.IP user
+= root
+.IP wait
+= no
+.RE
+}
+
+#
+# Sample RPC service
+#
+service rstatd
+{
+.RS
+.IP type 20
+= RPC
+.IP socket_type
+= dgram
+.IP protocol
+= udp
+.IP server
+= /usr/etc/rpc.rstatd
+.IP wait
+= yes
+.IP user
+= root
+.IP rpc_version
+= 2-4
+.IP env
+= LD_LIBRARY_PATH=/etc/securelib
+.RE
+}
+
+#
+# Sample unlisted service
+#
+service unlisted
+{
+.RS
+.IP type 20
+= UNLISTED
+.IP socket_type
+= stream
+.IP protocol
+= tcp
+.IP wait
+= no
+.IP server
+= /home/user/some_server
+.IP port
+= 20020
+.RE
+}
+.RE
+.PD
+.\" *********************** SEE ALSO ****************************
+.SH "SEE ALSO"
+.I "xinetd(1L),"
+.LP
+.I "xinetd.log(5)"
+.LP
+Postel J.,
+.IR "Echo Protocol" ,
+RFC 862,
+May 1983
+.LP
+Postel J.,
+.IR "Discard Protocol" ,
+RFC 863,
+May 1983
+.LP
+Postel J.,
+.IR "Character Generator Protocol" ,
+RFC 864,
+May 1983
+.LP
+Postel J.,
+.IR "Daytime Protocol" ,
+RFC 867,
+May 1983
+.LP
+Postel J., Harrenstien K.,
+.IR "Time Protocol" ,
+RFC 868,
+May 1983
+.LP
+M. Lottor,
+.IR "TCP Port Service Multiplexer (TCPMUX)" ,
+RFC 1078
+Nov 1988
+.LP
+StJohns M.,
+.IR " Identification Protocol" ,
+RFC 1413,
+February 1993
+.\" *********************** BUGS ****************************
+.SH BUGS
+.LP
+If the
+.B INTERCEPT
+flag is not used,
+access control on the address of the remote host is not performed when
+\fIwait\fP is \fIyes\fP and \fIsocket_type\fP is \fIstream\fP.
+.LP
+The NOLIBWRAP flag is automatically turned on for RPC services whose
+\fIsocket_type\fP is \fIstream\fP because xinetd cannot determine the
+address of the remote host.
+.LP
+If the 
+.B INTERCEPT
+flag is not used,
+access control on the address of the remote host for
+services where \fIwait\fP is \fIyes\fP and \fIsocket_type\fP is \fIdgram\fP
+is performed only on the first packet. The server may then accept packets
+from hosts not in the access control list. This can happen with 
+.B RPC
+services.
+.LP
+There is no way to put a
+.SM SPACE
+in an environment variable.
+.LP
+When \fIwait\fP is \fIyes\fP and \fIsocket_type\fP is \fIstream\fP,
+the socket passed to the server can only accept connections.
+.LP
+The
+.B INTERCEPT
+flag is not supported for internal services or multi-threaded services.
 
=== added file '.pc/applied-patches'
--- .pc/applied-patches	1970-01-01 00:00:00 +0000
+++ .pc/applied-patches	2013-08-14 10:06:03 +0000
@@ -0,0 +1,3 @@
+000001-documentation_fixes
+000004-Fix-xinetd.log.man-installation-path
+000008-fix-manpages
 
=== modified file 'CHANGELOG'
--- CHANGELOG	2006-01-19 15:34:04 +0000
+++ CHANGELOG	2013-08-14 10:06:03 +0000
@@ -907,3 +907,28 @@
 		Based on a patch from Tony Ernst.
 	Remove the <1024 port check for UDP builtin services.
 		This check has been rather antiquated for years.
+
+2.3.15
+	If the address we're binding to is a multicast address, do the
+		multicast join.
+	Merge the Fedora patch to turn off libwrap processing on tcp
+		rpc services. Patch xinetd-2.3.12-tcp_rpc.patch.
+	Merge the Fedora patch to add labeled networking.
+		Patch xinetd-2.3.14-label.patch r1.4.
+	Merge the Fedora patch to fix getpeercon() for labeled networking
+		in MLS environments.  
+		Patch xinetd-2.3.14-contextconf.patch r1.1
+	Merge the Fedora patch for int->ssize_t. 
+		Patch xinetd-2.3.14-ssize_t.patch r1.1
+		Some modifications to this patch were necessary.
+	Change compiler flags, -Wconversion generates excessive and
+		unnecessary warnings with gcc, particularly all
+		cases of ntohs(uint16_t).
+		http://gcc.gnu.org/bugzilla/show_bug.cgi?id=6614
+		Additionally add -Wno-unused to prevent unnecessary
+		warnings regarding unused function parameters when
+		the function is a callback conforming to a standard
+		interface.
+	Change version number to 2.3.15devel, indicating an interim
+		developmental source snapshot.
+	Merge patch from Thomas Swan regarding CVE-2012-0862
 
=== modified file 'Makefile.in'
--- Makefile.in	2007-11-29 09:29:55 +0000
+++ Makefile.in	2013-08-14 10:06:03 +0000
@@ -15,7 +15,7 @@
 LIBS = -lsio -lstr -lmisc -lxlog -lportable -lpset @LIBS@
 
 CFLAGS += @CFLAGS@ 
-DCFLAGS = -Wall -Wredundant-decls -W -Wfloat-equal -Wundef -Wcast-qual -Wwrite-strings -Wconversion -Wmissing-noreturn -Wmissing-format-attribute -Wshadow -Wpointer-arith -g
+DCFLAGS = -Wall -Wredundant-decls -W -Wfloat-equal -Wundef -Wcast-qual -Wwrite-strings -Wmissing-noreturn -Wmissing-format-attribute -Wshadow -Wpointer-arith -Wno-unused -g
 
 
 DEFS = @DEFS@
@@ -80,7 +80,7 @@
 	$(INSTALL_CMD) -m 755 xinetd/itox $(DAEMONDIR)
 	$(INSTALL_CMD) -m 755 $(SRCDIR)/xinetd/xconv.pl $(DAEMONDIR)
 	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.conf.man $(MANDIR)/man5/xinetd.conf.5
-	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.log.man $(MANDIR)/man8/xinetd.log.8
+	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.log.man $(MANDIR)/man5/xinetd.log.5
 	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.man $(MANDIR)/man8/xinetd.8
 	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/itox.8 $(MANDIR)/man8/itox.8
 	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xconv.pl.8 $(MANDIR)/man8/xconv.pl.8
 
=== modified file 'config.guess'
--- config.guess	2012-05-27 19:26:42 +0000
+++ config.guess	2013-08-14 10:06:03 +0000
@@ -1,10 +1,9 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011, 2012 Free Software Foundation, Inc.
+#   2000, 2001, 2002 Free Software Foundation, Inc.
 
-timestamp='2012-02-10'
+timestamp='2002-03-20'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -17,24 +16,24 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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.  Please send patches (context
-# diff format) to <[e-mail]> and include a ChangeLog
-# entry.
+# Originally written by Per Bothner <[e-mail]>.
+# Please send patches to <[e-mail]>.  Submit a context
+# diff and a properly formatted ChangeLog entry.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
 # exits with 0.  Otherwise, it exits with 1.
 #
-# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+# The plan is that this can be called by configure scripts if you
+# don't specify an explicit build system type.
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -54,8 +53,7 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -68,11 +66,11 @@
 while test $# -gt 0 ; do
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
+       echo "$timestamp" ; exit 0 ;;
     --version | -v )
-       echo "$version" ; exit ;;
+       echo "$version" ; exit 0 ;;
     --help | --h* | -h )
-       echo "$usage"; exit ;;
+       echo "$usage"; exit 0 ;;
     -- )     # Stop option processing
        shift; break ;;
     - )	# Use stdin as input.
@@ -90,42 +88,30 @@
   exit 1
 fi
 
-trap '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.
-
+
+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.
 # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
 # use `HOST_CC' if defined, but it is deprecated.
 
-# 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 ;
+set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,)    echo "int dummy(){}" > $dummy.c ;
 	for c in cc gcc c89 c99 ; do
-	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+	  ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
+	  if test $? = 0 ; 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 ; set_cc_for_build= ;'
+esac'
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # ([e-mail] 1994-08-24)
@@ -143,7 +129,7 @@
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:NetBSD:*:*)
 	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
 	# switched to ELF, *-*-netbsd* would select the old
 	# object file format.  This provides both forward
@@ -156,11 +142,9 @@
 	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 ;;
-	    sh5el) machine=sh5le-unknown ;;
 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
@@ -169,7 +153,7 @@
 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep -q __ELF__
+			| grep __ELF__ >/dev/null
 		then
 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
 		    # Return netbsd for either.  FIX?
@@ -179,135 +163,145 @@
 		fi
 		;;
 	    *)
-		os=netbsd
+	        os=netbsd
 		;;
 	esac
 	# The OS release
-	# 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
+	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
 	# 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 ;;
+	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 ;;
     *:OpenBSD:*:*)
-	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 powerpc-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
-    *:MirBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
+	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     alpha:OSF1:*:*)
-	case $UNAME_RELEASE in
-	*4.0)
+	if test $UNAME_RELEASE = "V4.0"; then
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-		;;
-	*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.
+	fi
 	# 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.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
-	exitcode=$?
-	trap '' 0
-	exit $exitcode ;;
+	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 ;;
     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 ;;
+	exit 0 ;;
     21064:Windows_NT:50:3)
 	echo alpha-dec-winnt3.5
-	exit ;;
+	exit 0 ;;
     Amiga*:UNIX_System_V:4.0:*)
 	echo m68k-unknown-sysv4
-	exit ;;
+	exit 0;;
     *:[Aa]miga[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit ;;
+	exit 0 ;;
     *:[Mm]orph[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-morphos
-	exit ;;
+	exit 0 ;;
     *:OS/390:*:*)
 	echo i370-ibm-openedition
-	exit ;;
-    *:z/VM:*:*)
-	echo s390-ibm-zvmoe
-	exit ;;
-    *:OS400:*:*)
-	echo powerpc-ibm-os400
-	exit ;;
+	exit 0 ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit ;;
-    arm:riscos:*:*|arm:RISCOS:*:*)
-	echo arm-unknown-riscos
-	exit ;;
+	exit 0;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
 	echo hppa1.1-hitachi-hiuxmpp
-	exit ;;
+	exit 0;;
     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
 	# [e-mail] (Earle F. Ake) contributed MIS and NILE.
 	if test "`(/bin/universe) 2>/dev/null`" = att ; then
@@ -315,51 +309,25 @@
 	else
 		echo pyramid-pyramid-bsd
 	fi
-	exit ;;
+	exit 0 ;;
     NILE*:*:*:dcosx)
 	echo pyramid-pyramid-svr4
-	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 ;;
-    s390x:SunOS:*:*)
-	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
+	exit 0 ;;
     sun4H:SunOS:5.*:*)
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
+	exit 0 ;;
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
-	echo i386-pc-auroraux${UNAME_RELEASE}
-	exit ;;
-    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-	eval $set_cc_for_build
-	SUN_ARCH="i386"
-	# If there is a compiler, see if it is configured for 64-bit objects.
-	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
-	# This test works for both compilers.
-	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		grep IS_64BIT_ARCH >/dev/null
-	    then
-		SUN_ARCH="x86_64"
-	    fi
-	fi
-	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
+	exit 0 ;;
+    i86pc:SunOS:5.*:*)
+	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit 0 ;;
     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 ;;
+	exit 0 ;;
     sun4*:SunOS:*:*)
 	case "`/usr/bin/arch -k`" in
 	    Series*|S4*)
@@ -368,10 +336,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 ;;
+	exit 0 ;;
     sun3*:SunOS:*:*)
 	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     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
@@ -383,10 +351,10 @@
 		echo sparc-sun-sunos${UNAME_RELEASE}
 		;;
 	esac
-	exit ;;
+	exit 0 ;;
     aushp:SunOS:*:*)
 	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     # 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
@@ -396,41 +364,38 @@
     # MiNT.  But MiNT is downward compatible to TOS, so this should
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
+        echo m68k-atari-mint${UNAME_RELEASE}
+	exit 0 ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
+        exit 0 ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
+        echo m68k-atari-mint${UNAME_RELEASE}
+	exit 0 ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-	echo m68k-milan-mint${UNAME_RELEASE}
-	exit ;;
+        echo m68k-milan-mint${UNAME_RELEASE}
+        exit 0 ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-	echo m68k-hades-mint${UNAME_RELEASE}
-	exit ;;
+        echo m68k-hades-mint${UNAME_RELEASE}
+        exit 0 ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-	echo m68k-unknown-mint${UNAME_RELEASE}
-	exit ;;
-    m68k:machten:*:*)
-	echo m68k-apple-machten${UNAME_RELEASE}
-	exit ;;
+        echo m68k-unknown-mint${UNAME_RELEASE}
+        exit 0 ;;
     powerpc:machten:*:*)
 	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     RISC*:Mach:*:*)
 	echo mips-dec-mach_bsd4.3
-	exit ;;
+	exit 0 ;;
     RISC*:ULTRIX:*:*)
 	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     VAX*:ULTRIX*:*:*)
 	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     2020:CLIX:*:* | 2430:CLIX:*:*)
 	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -454,36 +419,30 @@
 	  exit (-1);
 	}
 EOF
-	$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; }
+	$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
 	echo mips-mips-riscos${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     Motorola:PowerMAX_OS:*:*)
 	echo powerpc-motorola-powermax
-	exit ;;
-    Motorola:*:4.3:PL8-*)
-	echo powerpc-harris-powermax
-	exit ;;
-    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-	echo powerpc-harris-powermax
-	exit ;;
+	exit 0 ;;
     Night_Hawk:Power_UNIX:*:*)
 	echo powerpc-harris-powerunix
-	exit ;;
+	exit 0 ;;
     m88k:CX/UX:7*:*)
 	echo m88k-harris-cxux7
-	exit ;;
+	exit 0 ;;
     m88k:*:4*:R4*)
 	echo m88k-motorola-sysv4
-	exit ;;
+	exit 0 ;;
     m88k:*:3*:R3*)
 	echo m88k-motorola-sysv3
-	exit ;;
+	exit 0 ;;
     AViiON:dgux:*:*)
-	# DG/UX returns AViiON for all architectures
-	UNAME_PROCESSOR=`/usr/bin/uname -p`
+        # DG/UX returns AViiON for all architectures
+        UNAME_PROCESSOR=`/usr/bin/uname -p`
 	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
 	then
 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
@@ -496,29 +455,29 @@
 	else
 	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
-	exit ;;
+ 	exit 0 ;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
-	exit ;;
+	exit 0 ;;
     M88*:*:R3*:*)
 	# Delta 88k system running SVR3
 	echo m88k-motorola-sysv3
-	exit ;;
+	exit 0 ;;
     XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
 	echo m88k-tektronix-sysv3
-	exit ;;
+	exit 0 ;;
     Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
 	echo m68k-tektronix-bsd
-	exit ;;
+	exit 0 ;;
     *:IRIX*:*:*)
 	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit ;;
+	exit 0 ;;
     ????????: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 ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
+	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
+	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
     i*86:AIX:*:*)
 	echo i386-ibm-aix
-	exit ;;
+	exit 0 ;;
     ia64:AIX:*:*)
 	if [ -x /usr/bin/oslevel ] ; then
 		IBM_REV=`/usr/bin/oslevel`
@@ -526,7 +485,7 @@
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
 	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit ;;
+	exit 0 ;;
     *:AIX:2:3)
 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
 		eval $set_cc_for_build
@@ -541,19 +500,16 @@
 			exit(0);
 			}
 EOF
-		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
-		then
-			echo "$SYSTEM_NAME"
-		else
-			echo rs6000-ibm-aix3.2.5
-		fi
+		$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
 	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 ;;
-    *:AIX:*:[4567])
+	exit 0 ;;
+    *: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
 		IBM_ARCH=rs6000
@@ -566,28 +522,28 @@
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit ;;
+	exit 0 ;;
     *:AIX:*:*)
 	echo rs6000-ibm-aix
-	exit ;;
+	exit 0 ;;
     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
 	echo romp-ibm-bsd4.4
-	exit ;;
+	exit 0 ;;
     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
 	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit ;;                             # report: romp-ibm BSD 4.3
+	exit 0 ;;                           # report: romp-ibm BSD 4.3
     *:BOSX:*:*)
 	echo rs6000-bull-bosx
-	exit ;;
+	exit 0 ;;
     DPX/2?00:B.O.S.:*:*)
 	echo m68k-bull-sysv3
-	exit ;;
+	exit 0 ;;
     9000/[34]??:4.3bsd:1.*:*)
 	echo m68k-hp-bsd
-	exit ;;
+	exit 0 ;;
     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
 	echo m68k-hp-bsd4.4
-	exit ;;
+	exit 0 ;;
     9000/[34678]??:HP-UX:*:*)
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	case "${UNAME_MACHINE}" in
@@ -596,84 +552,64 @@
 	    9000/[678][0-9][0-9])
 		if [ -x /usr/bin/getconf ]; then
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-		    case "${sc_cpu_version}" in
-		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-		      532)                      # CPU_PA_RISC2_0
-			case "${sc_kernel_bits}" in
-			  32) HP_ARCH="hppa2.0n" ;;
-			  64) HP_ARCH="hppa2.0w" ;;
+                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+                    case "${sc_cpu_version}" in
+                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+                      532)                      # CPU_PA_RISC2_0
+                        case "${sc_kernel_bits}" in
+                          32) HP_ARCH="hppa2.0n" ;;
+                          64) HP_ARCH="hppa2.0w" ;;
 			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-			esac ;;
-		    esac
+                        esac ;;
+                    esac
 		fi
 		if [ "${HP_ARCH}" = "" ]; then
 		    eval $set_cc_for_build
-		    sed 's/^		//' << EOF >$dummy.c
-
-		#define _HPUX_SOURCE
-		#include <stdlib.h>
-		#include <unistd.h>
-
-		int main ()
-		{
-		#if defined(_SC_KERNEL_BITS)
-		    long bits = sysconf(_SC_KERNEL_BITS);
-		#endif
-		    long cpu  = sysconf (_SC_CPU_VERSION);
-
-		    switch (cpu)
-			{
-			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-			case CPU_PA_RISC2_0:
-		#if defined(_SC_KERNEL_BITS)
-			    switch (bits)
-				{
-				case 64: puts ("hppa2.0w"); break;
-				case 32: puts ("hppa2.0n"); break;
-				default: puts ("hppa2.0"); break;
-				} break;
-		#else  /* !defined(_SC_KERNEL_BITS) */
-			    puts ("hppa2.0"); break;
-		#endif
-			default: puts ("hppa1.0"); break;
-			}
-		    exit (0);
-		}
+		    sed 's/^              //' << EOF >$dummy.c
+
+              #define _HPUX_SOURCE
+              #include <stdlib.h>
+              #include <unistd.h>
+
+              int main ()
+              {
+              #if defined(_SC_KERNEL_BITS)
+                  long bits = sysconf(_SC_KERNEL_BITS);
+              #endif
+                  long cpu  = sysconf (_SC_CPU_VERSION);
+
+                  switch (cpu)
+              	{
+              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+              	case CPU_PA_RISC2_0:
+              #if defined(_SC_KERNEL_BITS)
+              	    switch (bits)
+              		{
+              		case 64: puts ("hppa2.0w"); break;
+              		case 32: puts ("hppa2.0n"); break;
+              		default: puts ("hppa2.0"); break;
+              		} break;
+              #else  /* !defined(_SC_KERNEL_BITS) */
+              	    puts ("hppa2.0"); break;
+              #endif
+              	default: puts ("hppa1.0"); break;
+              	}
+                  exit (0);
+              }
 EOF
-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-		    test -z "$HP_ARCH" && HP_ARCH=hppa
+		    (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
 		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 -q __LP64__
-	    then
-		HP_ARCH="hppa2.0w"
-	    else
-		HP_ARCH="hppa64"
-	    fi
-	fi
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit ;;
+	exit 0 ;;
     ia64:HP-UX:*:*)
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	echo ia64-hp-hpux${HPUX_REV}
-	exit ;;
+	exit 0 ;;
     3050*:HI-UX:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -701,173 +637,160 @@
 	  exit (0);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
-		{ echo "$SYSTEM_NAME"; exit; }
+	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
+	rm -f $dummy.c $dummy
 	echo unknown-hitachi-hiuxwe2
-	exit ;;
+	exit 0 ;;
     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
 	echo hppa1.1-hp-bsd
-	exit ;;
+	exit 0 ;;
     9000/8??:4.3bsd:*:*)
 	echo hppa1.0-hp-bsd
-	exit ;;
+	exit 0 ;;
     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
 	echo hppa1.0-hp-mpeix
-	exit ;;
+	exit 0 ;;
     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
 	echo hppa1.1-hp-osf
-	exit ;;
+	exit 0 ;;
     hp8??:OSF1:*:*)
 	echo hppa1.0-hp-osf
-	exit ;;
+	exit 0 ;;
     i*86:OSF1:*:*)
 	if [ -x /usr/sbin/sysversion ] ; then
 	    echo ${UNAME_MACHINE}-unknown-osf1mk
 	else
 	    echo ${UNAME_MACHINE}-unknown-osf1
 	fi
-	exit ;;
+	exit 0 ;;
     parisc*:Lites*:*:*)
 	echo hppa1.1-hp-lites
-	exit ;;
+	exit 0 ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
-	exit ;;
+        exit 0 ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-	exit ;;
+        exit 0 ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 	echo c34-convex-bsd
-	exit ;;
+        exit 0 ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 	echo c38-convex-bsd
-	exit ;;
+        exit 0 ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
-	exit ;;
+        exit 0 ;;
     CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
+	exit 0 ;;
     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 ;;
+	exit 0 ;;
     CRAY*TS:*:*:*)
 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
+	exit 0 ;;
+    CRAY*T3D:*:*:*)
+	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit 0 ;;
     CRAY*T3E:*:*:*)
 	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
+	exit 0 ;;
     CRAY*SV1:*:*:*)
 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    *:UNICOS/mp:*:*)
-	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
+	exit 0 ;;
     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 ;;
-    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 ;;
+        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 ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     sparc*:BSD/OS:*:*)
 	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     *:BSD/OS:*:*)
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     *:FreeBSD:*:*)
-	UNAME_PROCESSOR=`/usr/bin/uname -p`
-	case ${UNAME_PROCESSOR} in
-	    amd64)
-		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	    *)
-		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	esac
-	exit ;;
+	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	exit 0 ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
-	exit ;;
-    *:MINGW*:*)
+	exit 0 ;;
+    i*:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
-	exit ;;
-    i*:MSYS*:*)
-	echo ${UNAME_MACHINE}-pc-msys
-	exit ;;
-    i*:windows32*:*)
-	# uname -m includes "-pc" on this system.
-	echo ${UNAME_MACHINE}-mingw32
-	exit ;;
+	exit 0 ;;
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
-	exit ;;
-    *:Interix*:*)
-	case ${UNAME_MACHINE} in
-	    x86)
-		echo i586-pc-interix${UNAME_RELEASE}
-		exit ;;
-	    authenticamd | genuineintel | EM64T)
-		echo x86_64-unknown-interix${UNAME_RELEASE}
-		exit ;;
-	    IA64)
-		echo ia64-unknown-interix${UNAME_RELEASE}
-		exit ;;
-	esac ;;
-    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-	echo i${UNAME_MACHINE}-pc-mks
-	exit ;;
-    8664:Windows_NT:*)
-	echo x86_64-pc-mks
-	exit ;;
+	exit 0 ;;
+    x86:Interix*:3*)
+	echo i386-pc-interix3
+	exit 0 ;;
     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 i586-pc-interix
-	exit ;;
+	echo i386-pc-interix
+	exit 0 ;;
     i*:UWIN*:*)
 	echo ${UNAME_MACHINE}-pc-uwin
-	exit ;;
-    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-	echo x86_64-unknown-cygwin
-	exit ;;
+	exit 0 ;;
     p*:CYGWIN*:*)
 	echo powerpcle-unknown-cygwin
-	exit ;;
+	exit 0 ;;
     prep*:SunOS:5.*:*)
 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
+	exit 0 ;;
     *:GNU:*:*)
-	# the GNU system
 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	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 ;;
+	exit 0 ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
-	exit ;;
-    aarch64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    aarch64_be:Linux:*:*)
-	UNAME_MACHINE=aarch64_be
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
+	exit 0 ;;
+    arm*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
+    ia64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
+    m68*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
+    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
+	#else
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+	CPU=mips
+	#else
+	CPU=
+	#endif
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+	rm -f $dummy.c
+	test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0
+	;;
+    ppc:Linux:*:*)
+	echo powerpc-unknown-linux-gnu
+	exit 0 ;;
+    ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-gnu
+	exit 0 ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
 	  EV5)   UNAME_MACHINE=alphaev5 ;;
@@ -877,90 +800,11 @@
 	  EV6)   UNAME_MACHINE=alphaev6 ;;
 	  EV67)  UNAME_MACHINE=alphaev67 ;;
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
-	esac
-	objdump --private-headers /bin/sh | grep -q ld.so.1
+        esac
+	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 ;;
-    arm*:Linux:*:*)
-	eval $set_cc_for_build
-	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-	    | grep -q __ARM_EABI__
-	then
-	    echo ${UNAME_MACHINE}-unknown-linux-gnu
-	else
-	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
-		| grep -q __ARM_PCS_VFP
-	    then
-		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
-	    else
-		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
-	    fi
-	fi
-	exit ;;
-    avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    cris:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-gnu
-	exit ;;
-    crisv32:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-gnu
-	exit ;;
-    frv:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    hexagon:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    i*86:Linux:*:*)
-	LIBC=gnu
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-	exit ;;
-    ia64:Linux:*:*)
-	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 ;;
-    mips:Linux:*:* | mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef ${UNAME_MACHINE}
-	#undef ${UNAME_MACHINE}el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=${UNAME_MACHINE}el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=${UNAME_MACHINE}
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
-    or32:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    padre:Linux:*:*)
-	echo sparc-unknown-linux-gnu
-	exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
-	exit ;;
+	exit 0 ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -968,71 +812,90 @@
 	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
 	  *)    echo hppa-unknown-linux-gnu ;;
 	esac
-	exit ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit ;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-	exit ;;
+	exit 0 ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-gnu
+	exit 0 ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
-	exit ;;
-    sh64*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
+	exit 0 ;;
     sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
+	exit 0 ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    tile*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-gnu
-	exit ;;
+	exit 0 ;;
     x86_64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    xtensa*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
+	echo x86_64-unknown-linux-gnu
+	exit 0 ;;
+    i*86:Linux:*:*)
+	# The BFD linker knows what the default object file format is, so
+	# first see if it will tell us. cd to the root directory to prevent
+	# problems with other programs or directories called `ld' in the path.
+	# Set LC_ALL=C to ensure ld outputs messages in English.
+	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
+			 | sed -ne '/supported targets:/!d
+				    s/[ 	][ 	]*/ /g
+				    s/.*supported targets: *//
+				    s/ .*//
+				    p'`
+        case "$ld_supported_targets" in
+	  elf32-i386)
+		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+		;;
+	  a.out-i386-linux)
+		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+		exit 0 ;;		
+	  coff-i386)
+		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+		exit 0 ;;
+	  "")
+		# 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 ;;
+	esac
+	# Determine whether the default compiler is a.out or elf
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#include <features.h>
+	#ifdef __ELF__
+	# ifdef __GLIBC__
+	#  if __GLIBC__ >= 2
+	LIBC=gnu
+	#  else
+	LIBC=gnulibc1
+	#  endif
+	# else
+	LIBC=gnulibc1
+	# endif
+	#else
+	#ifdef __INTEL_COMPILER
+	LIBC=gnu
+	#else
+	LIBC=gnuaout
+	#endif
+	#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
+	;;
     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 ;;
+	exit 0 ;;
     i*86:UNIX_SV:4.2MP:2.*)
-	# Unixware is an offshoot of SVR4, but it has its own version
-	# number series starting with 2...
-	# I am not positive that other SVR4 systems won't match this,
+        # Unixware is an offshoot of SVR4, but it has its own version
+        # number series starting with 2...
+        # I am not positive that other SVR4 systems won't match this,
 	# I just have to hope.  -- rms.
-	# Use sysv4.2uw... so that sysv4* matches it.
+        # Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	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.[02]*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit ;;
+	exit 0 ;;
     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
@@ -1040,113 +903,99 @@
 	else
 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
 	fi
-	exit ;;
-    i*86:*:5:[678]*)
-	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	exit 0 ;;
+    i*86:*:5:[78]*)
 	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 ;;
+	exit 0 ;;
     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|grep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
+		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_MACHINE=i586
-		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
+		(/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
 			&& UNAME_MACHINE=i686
-		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
+		(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
 			&& UNAME_MACHINE=i686
 		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
 	else
 		echo ${UNAME_MACHINE}-pc-sysv32
 	fi
-	exit ;;
+	exit 0 ;;
+    i*86:*DOS:*:*)
+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
+	exit 0 ;;
     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 i586.
-	# Note: whatever this is, it MUST be the same as what config.sub
-	# prints for the "djgpp" host, or else GDB configury will decide that
-	# this is a cross-build.
-	echo i586-pc-msdosdjgpp
-	exit ;;
+        # 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 ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
-	exit ;;
+	exit 0 ;;
     paragon:*:*:*)
 	echo i860-intel-osf1
-	exit ;;
+	exit 0 ;;
     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 ;;
+	exit 0 ;;
     mini*:CTIX:SYS*5:*)
 	# "miniframe"
 	echo m68010-convergent-sysv
-	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)
+	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)
 	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; }
+	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && { echo i486-ncr-sysv4; exit; } ;;
-    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
-	OS_REL='.3'
-	test -r /etc/.relid \
-	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
-	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+          && echo i486-ncr-sysv4 && exit 0 ;;
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
 	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     mc68030:UNIX_System_V:4.*:*)
 	echo m68k-atari-sysv4
-	exit ;;
+	exit 0 ;;
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+	echo i386-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
     TSUNAMI:LynxOS:2.*:*)
 	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     rs6000:LynxOS:2.*:*)
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
+	exit 0 ;;
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     SM[BE]S:UNIX_SV:*:*)
 	echo mips-dde-sysv${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     RM*:ReliantUNIX-*:*:*)
 	echo mips-sni-sysv4
-	exit ;;
+	exit 0 ;;
     RM*:SINIX-*:*:*)
 	echo mips-sni-sysv4
-	exit ;;
+	exit 0 ;;
     *:SINIX-*:*:*)
 	if uname -p 2>/dev/null >/dev/null ; then
 		UNAME_MACHINE=`(uname -p) 2>/dev/null`
@@ -1154,94 +1003,61 @@
 	else
 		echo ns32k-sni-sysv
 	fi
-	exit ;;
-    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-			# says <[e-mail]>
-	echo i586-unisys-sysv4
-	exit ;;
+	exit 0 ;;
+    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+                      # says <[e-mail]>
+        echo i586-unisys-sysv4
+        exit 0 ;;
     *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <[e-mail]>.
 	# How about differentiating between stratus architectures? -djm
 	echo hppa1.1-stratus-sysv4
-	exit ;;
+	exit 0 ;;
     *:*:*:FTX*)
 	# From [e-mail].
 	echo i860-stratus-sysv4
-	exit ;;
-    i*86:VOS:*:*)
-	# From [e-mail].
-	echo ${UNAME_MACHINE}-stratus-vos
-	exit ;;
+	exit 0 ;;
     *:VOS:*:*)
 	# From [e-mail].
 	echo hppa1.1-stratus-vos
-	exit ;;
+	exit 0 ;;
     mc68*:A/UX:*:*)
 	echo m68k-apple-aux${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     news*:NEWS-OS:6*:*)
 	echo mips-sony-newsos6
-	exit ;;
+	exit 0 ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
-		echo mips-nec-sysv${UNAME_RELEASE}
+	        echo mips-nec-sysv${UNAME_RELEASE}
 	else
-		echo mips-unknown-sysv${UNAME_RELEASE}
+	        echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
-	exit ;;
+        exit 0 ;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 	echo powerpc-be-beos
-	exit ;;
+	exit 0 ;;
     BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
 	echo powerpc-apple-beos
-	exit ;;
+	exit 0 ;;
     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
 	echo i586-pc-beos
-	exit ;;
-    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
-	echo i586-pc-haiku
-	exit ;;
+	exit 0 ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     SX-5:SUPER-UX:*:*)
 	echo sx5-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-6:SUPER-UX:*:*)
-	echo sx6-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-7:SUPER-UX:*:*)
-	echo sx7-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-8:SUPER-UX:*:*)
-	echo sx8-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-8R:SUPER-UX:*:*)
-	echo sx8r-nec-superux${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     *:Rhapsody:*:*)
 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     *:Darwin:*:*)
-	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	case $UNAME_PROCESSOR in
-	    i386)
-		eval $set_cc_for_build
-		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		      grep IS_64BIT_ARCH >/dev/null
-		  then
-		      UNAME_PROCESSOR="x86_64"
-		  fi
-		fi ;;
-	    unknown) UNAME_PROCESSOR=powerpc ;;
-	esac
-	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit ;;
+	echo `uname -p`-apple-darwin${UNAME_RELEASE}
+	exit 0 ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
 	UNAME_PROCESSOR=`uname -p`
 	if test "$UNAME_PROCESSOR" = "x86"; then
@@ -1249,28 +1065,22 @@
 		UNAME_MACHINE=pc
 	fi
 	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     *:QNX:*:4*)
 	echo i386-pc-qnx
-	exit ;;
-    NEO-?:NONSTOP_KERNEL:*:*)
-	echo neo-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    NSE-?:NONSTOP_KERNEL:*:*)
-	echo nse-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    NSR-?:NONSTOP_KERNEL:*:*)
+	exit 0 ;;
+    NSR-[GKLNPTVW]:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     *:NonStop-UX:*:*)
 	echo mips-compaq-nonstopux
-	exit ;;
+	exit 0 ;;
     BS2000:POSIX*:*:*)
 	echo bs2000-siemens-sysv
-	exit ;;
+	exit 0 ;;
     DS/*:UNIX_System_V:*:*)
 	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     *:Plan9:*:*)
 	# "uname -m" is not consistent, so use $cputype instead. 386
 	# is converted to i386 for consistency with other x86
@@ -1281,53 +1091,36 @@
 	    UNAME_MACHINE="$cputype"
 	fi
 	echo ${UNAME_MACHINE}-unknown-plan9
-	exit ;;
+	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 ;;
     *:TOPS-10:*:*)
 	echo pdp10-unknown-tops10
-	exit ;;
+	exit 0 ;;
     *:TENEX:*:*)
 	echo pdp10-unknown-tenex
-	exit ;;
+	exit 0 ;;
     KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
 	echo pdp10-dec-tops20
-	exit ;;
+	exit 0 ;;
     XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
 	echo pdp10-xkl-tops20
-	exit ;;
+	exit 0 ;;
     *:TOPS-20:*:*)
 	echo pdp10-unknown-tops20
-	exit ;;
+	exit 0 ;;
     *:ITS:*:*)
 	echo pdp10-unknown-its
-	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 ;;
-    i*86:AROS:*:*)
-	echo ${UNAME_MACHINE}-pc-aros
-	exit ;;
-    x86_64:VMkernel:*:*)
-	echo ${UNAME_MACHINE}-unknown-esx
-	exit ;;
+	exit 0 ;;
+    i*86:XTS-300:*:STOP)
+	echo ${UNAME_MACHINE}-unknown-stop
+	exit 0 ;;
+    i*86:atheos:*:*)
+	echo ${UNAME_MACHINE}-unknown-atheos
+	exit 0 ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1350,16 +1143,16 @@
 #include <sys/param.h>
   printf ("m68k-sony-newsos%s\n",
 #ifdef NEWSOS4
-	"4"
+          "4"
 #else
-	""
+	  ""
 #endif
-	); exit (0);
+         ); exit (0);
 #endif
 #endif
 
 #if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix\n"); exit (0);
+  printf ("arm-acorn-riscix"); exit (0);
 #endif
 
 #if defined (hp300) && !defined (hpux)
@@ -1448,12 +1241,12 @@
 }
 EOF
 
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-	{ echo "$SYSTEM_NAME"; exit; }
+$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
+rm -f $dummy.c $dummy
 
 # Apollos put the system type in the environment.
 
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
 
 # Convex versions that predate uname can use getsysinfo(1)
 
@@ -1462,22 +1255,22 @@
     case `getsysinfo -f cpu_type` in
     c1*)
 	echo c1-convex-bsd
-	exit ;;
+	exit 0 ;;
     c2*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-	exit ;;
+	exit 0 ;;
     c34*)
 	echo c34-convex-bsd
-	exit ;;
+	exit 0 ;;
     c38*)
 	echo c38-convex-bsd
-	exit ;;
+	exit 0 ;;
     c4*)
 	echo c4-convex-bsd
-	exit ;;
+	exit 0 ;;
     esac
 fi
 
@@ -1488,9 +1281,7 @@
 the operating system you are using. It is advised that you
 download the most up to date version of the config scripts from
 
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
-and
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+    ftp://ftp.gnu.org/pub/gnu/config/
 
 If the version you run ($0) is already up to date, please
 send the following data and any information you think might be
 
=== modified file 'config.h.in'
--- config.h.in	2006-01-19 15:34:04 +0000
+++ config.h.in	2013-08-14 10:06:03 +0000
@@ -112,6 +112,7 @@
 /* Options */
 #undef HAVE_LIBWRAP
 #undef LIBWRAP
+#undef LABELED_NET
 
 #undef HAVE_LOADAVG
 
@@ -124,7 +125,7 @@
 #undef rlim_t
 
 /* Versioning Information */
-#define XINETD_VERSION "xinetd Version 2.3.14"
+#define XINETD_VERSION "xinetd Version 2.3.15"
 #define MISC_VERSION   "MISC Version 1.2.2"
 #define PSET_VERSION   "PSET Version 1.2.0"
 #define SIO_VERSION    "SIO Version 1.6.2"
 
=== modified file 'config.sub'
--- config.sub	2012-05-27 19:26:42 +0000
+++ config.sub	2013-08-14 10:06:03 +0000
@@ -1,10 +1,9 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011, 2012 Free Software Foundation, Inc.
+#   2000, 2001, 2002 Free Software Foundation, Inc.
 
-timestamp='2012-02-10'
+timestamp='2002-03-07'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -21,25 +20,23 @@
 # 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, see <http://www.gnu.org/licenses/>.
-#
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, 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 <[e-mail]>.  Submit a context
-# diff and a properly formatted GNU ChangeLog entry.
+# diff and a properly formatted ChangeLog entry.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
 # If it is invalid, we print an error message on stderr and exit with code 1.
 # Otherwise, we print the canonical config type on stdout and succeed.
 
-# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
 # that are meaningful with *any* GNU software.
@@ -73,8 +70,7 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -87,11 +83,11 @@
 while test $# -gt 0 ; do
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
+       echo "$timestamp" ; exit 0 ;;
     --version | -v )
-       echo "$version" ; exit ;;
+       echo "$version" ; exit 0 ;;
     --help | --h* | -h )
-       echo "$usage"; exit ;;
+       echo "$usage"; exit 0 ;;
     -- )     # Stop option processing
        shift; break ;;
     - )	# Use stdin as input.
@@ -103,7 +99,7 @@
     *local*)
        # First pass through any local machine types.
        echo $1
-       exit ;;
+       exit 0;;
 
     * )
        break ;;
@@ -122,18 +118,10 @@
 # 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* | linux-android* | linux-dietlibc | linux-newlib* | \
-  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-  knetbsd*-gnu* | netbsd*-gnu* | \
-  kopensolaris*-gnu* | \
-  storm-chaos* | os2-emx* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
-  android-linux)
-    os=-linux-android
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
-    ;;
   *)
     basic_machine=`echo $1 | sed 's/-[^-]*$//'`
     if [ $basic_machine != $1 ]
@@ -156,13 +144,10 @@
 	-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 | -knuth | -cray | -microblaze)
+	-apple | -axis)
 		os=
 		basic_machine=$1
 		;;
-	-bluegene*)
-		os=-cnk
-		;;
 	-sim | -cisco | -oki | -wec | -winbond)
 		os=
 		basic_machine=$1
@@ -177,17 +162,13 @@
 		os=-chorusos
 		basic_machine=$1
 		;;
-	-chorusrdb)
-		os=-chorusrdb
+ 	-chorusrdb)
+ 		os=-chorusrdb
 		basic_machine=$1
-		;;
+ 		;;
 	-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/'`
@@ -204,10 +185,6 @@
 		# 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/'`
@@ -249,103 +226,43 @@
 	# Some are omitted here because they have special meanings below.
 	1750a | 580 \
 	| a29k \
-	| aarch64 | aarch64_be \
 	| 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 | avr32 \
-        | be32 | be64 \
-	| bfin \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
 	| c4x | clipper \
-	| d10v | d30v | dlx | dsp16xx \
-	| epiphany \
-	| fido | fr30 | frv \
+	| d10v | d30v | dsp16xx \
+	| fr30 \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| hexagon \
 	| i370 | i860 | i960 | ia64 \
-	| ip2k | iq2000 \
-	| le32 | le64 \
-	| lm32 \
-	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore | mep | metag \
-	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips16 \
-	| mips64 | mips64el \
-	| mips64octeon | mips64octeonel \
-	| mips64orion | mips64orionel \
-	| mips64r5900 | mips64r5900el \
-	| mips64vr | mips64vrel \
-	| mips64vr4100 | mips64vr4100el \
-	| mips64vr4300 | mips64vr4300el \
-	| mips64vr5000 | mips64vr5000el \
-	| mips64vr5900 | mips64vr5900el \
-	| mipsisa32 | mipsisa32el \
-	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa64 | mipsisa64el \
-	| mipsisa64r2 | mipsisa64r2el \
-	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipstx39 | mipstx39el \
+	| m32r | m68000 | m68k | m88k | mcore \
+	| mips | mips16 | mips64 | mips64el | mips64orion | mips64orionel \
+	| mips64vr4100 | mips64vr4100el | mips64vr4300 \
+	| mips64vr4300el | mips64vr5000 | mips64vr5000el \
+	| mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
+	| mipsisa32 | mipsisa64 \
 	| mn10200 | mn10300 \
-	| moxie \
-	| mt \
-	| msp430 \
-	| nds32 | nds32le | nds32be \
-	| nios | nios2 \
 	| ns16k | ns32k \
-	| open8 \
-	| or32 \
+	| openrisc | or32 \
 	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle \
+	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| rl78 | rx \
-	| score \
-	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
-	| sh64 | sh64le \