Upgrading to GitLab 11.10.0. Expect errors and see debian-infrastructure-announce@lists.debian.org for further information.

Commit 13e513c0 authored by Faidon Liambotis's avatar Faidon Liambotis

Import Upstream version 1.6

parent 91f6c75d
......@@ -13,6 +13,8 @@ Kolbjørn Barmen
Linus Nordberg
Maja Wolniewicz
Milan Sova
Paul Dekkers
Paweł Gołaszewski
Ralf Paffrath
Simon Leinen
Stefan Winter
......
2011-04-27 1.6
Incompatible changes:
- The default shared secret for TLS and DTLS connections change
from "mysecret" to "radsec" as per draft-ietf-radext-radsec-12
section 2.3 (4). Please make sure to specify a secret in both
client and server blocks to avoid unwanted surprises.
(RADSECPROXY-19)
- The default place to look for a configuration file has changed
from /etc to /usr/local/etc. Let radsecproxy know where your
configuration file can be found by using the `-c' command line
option. Or configure radsecproxy with --sysconfdir=/etc to
restore the old behaviour. (RADSECPROXY-31)
New features:
- Improved F-Ticks logging options. F-Ticks can now be sent to a
separate syslog facility and the VISINST label can now be
configured explicitly. This was implemented by Maja
Gorecka-Wolniewicz and Paweł Gołaszewski. (RADSECPROXY-29)
- New config option PidFile. (RADSECPROXY-32)
- Preliminary support for DynamicLookupCommand added. It's for
TLS servers only at this point. Also, beware of risks for memory
leaks. In addition to this, for extra adventurous users, there's
a new configure option --enable-experimental-dyndisc which enables
even more new code for handling of dynamic discovery of TLS
servers.
- Address family (IPv4 or IPv6) can now be specified for clients
and servers. (RADSECPROXY-37)
Bug fixes:
- Stop the autoconfery from warning about defining variables
conditionally and unconditionally.
- Honour configure option --sysconfdir. (RADSECPROXY-31)
- Don't crash on failing DynamicLookupCommand scripts. Fix made
with help from Ralf Paffrath. (RADSECPROXY-33)
- When a DynamicLookupCommand script is failing, fall back to
other server(s) in the realm. The timeout depends on the kind of
failure.
- Other bugs. (RADSECPROXY-26, -28, -34, -35, -39, -40)
2011-10-08 1.5
New features:
- Support for F-Ticks logging.
......
AUTOMAKE_OPTIONS = foreign
if WANT_FTICKS
fticks_sources = fticks.c fticks.h fticks_hashmac.c fticks_hashmac.h
fticks_programs = radsecproxy-hash
radsecproxy_hash_LDADD = fticks_hashmac.o hash.o list.o
endif
if HAVE_DOCBOOK2X_MAN
GENMANPAGES = radsecproxy.conf.5
endif
SUBDIRS = tests
sbin_PROGRAMS = radsecproxy
bin_PROGRAMS = radsecproxy-conf
bin_PROGRAMS = radsecproxy-conf $(fticks_programs)
noinst_LIBRARIES = librsp.a
radsecproxy_SOURCES = main.c
librsp_a_SOURCES = \
$(fticks_sources) \
debug.c debug.h \
dtls.c dtls.h \
gconfig.c gconfig.h \
......@@ -31,6 +43,7 @@ radsecproxy_conf_SOURCES = \
util.c util.h
####################
AM_CPPFLAGS = -DSYSCONFDIR=\"$(sysconfdir)\"
AM_CFLAGS = \
-g -Wall -Werror -fno-strict-aliasing @SSL_CFLAGS@ @TARGET_CFLAGS@
......@@ -39,30 +52,17 @@ radsecproxy_LDADD = librsp.a @SSL_LIBS@
radsecproxy_conf_LDFLAGS = @TARGET_LDFLAGS@
####################
if HAVE_DOCBOOK2X_MAN
GENMANPAGES = radsecproxy.conf.5
endif
dist_man_MANS = radsecproxy.1 radsecproxy-hash.1 $(GENMANPAGES)
EXTRA_DIST = \
configure Makefile.in tests/Makefile.in \
compile config.guess config.sub install-sh missing depcomp
EXTRA_DIST += \
LICENSE THANKS \
configure Makefile.in tests/Makefile.in \
compile config.guess config.sub install-sh missing depcomp \
radsecproxy.conf.5.xml radsecproxy.conf-example \
tools/README tools/naptr-eduroam.sh tools/radsec-dynsrv.sh
DISTCHECK_CONFIGURE_FLAGS = --enable-fticks
####################
if WANT_FTICKS
librsp_a_SOURCES += fticks.c fticks.h fticks_hashmac.c fticks_hashmac.h
bin_PROGRAMS += radsecproxy-hash
radsecproxy_hash_LDADD = fticks_hashmac.o hash.o list.o
endif
####################
radsecproxy.conf.5: $(srcdir)/radsecproxy.conf.5.xml
docbook2x-man $<
......
......@@ -38,10 +38,6 @@ host_triplet = @host@
target_triplet = @target@
sbin_PROGRAMS = radsecproxy$(EXEEXT)
bin_PROGRAMS = radsecproxy-conf$(EXEEXT) $(am__EXEEXT_1)
####################
@WANT_FTICKS_TRUE@am__append_1 = fticks.c fticks.h fticks_hashmac.c fticks_hashmac.h
@WANT_FTICKS_TRUE@am__append_2 = radsecproxy-hash
subdir = .
DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
......@@ -63,19 +59,19 @@ AR = ar
ARFLAGS = cru
librsp_a_AR = $(AR) $(ARFLAGS)
librsp_a_LIBADD =
am__librsp_a_SOURCES_DIST = debug.c debug.h dtls.c dtls.h gconfig.c \
am__librsp_a_SOURCES_DIST = fticks.c fticks.h fticks_hashmac.c \
fticks_hashmac.h debug.c debug.h dtls.c dtls.h gconfig.c \
gconfig.h hash.c hash.h hostport.c hostport.h list.c list.h \
radmsg.c radmsg.h radsecproxy.c radsecproxy.h tcp.c tcp.h \
tls.c tls.h tlscommon.c tlscommon.h tlv11.c tlv11.h udp.c \
udp.h util.c util.h fticks.c fticks.h fticks_hashmac.c \
fticks_hashmac.h
udp.h util.c util.h
@WANT_FTICKS_TRUE@am__objects_1 = fticks.$(OBJEXT) \
@WANT_FTICKS_TRUE@ fticks_hashmac.$(OBJEXT)
am_librsp_a_OBJECTS = debug.$(OBJEXT) dtls.$(OBJEXT) gconfig.$(OBJEXT) \
hash.$(OBJEXT) hostport.$(OBJEXT) list.$(OBJEXT) \
radmsg.$(OBJEXT) radsecproxy.$(OBJEXT) tcp.$(OBJEXT) \
tls.$(OBJEXT) tlscommon.$(OBJEXT) tlv11.$(OBJEXT) \
udp.$(OBJEXT) util.$(OBJEXT) $(am__objects_1)
am_librsp_a_OBJECTS = $(am__objects_1) debug.$(OBJEXT) dtls.$(OBJEXT) \
gconfig.$(OBJEXT) hash.$(OBJEXT) hostport.$(OBJEXT) \
list.$(OBJEXT) radmsg.$(OBJEXT) radsecproxy.$(OBJEXT) \
tcp.$(OBJEXT) tls.$(OBJEXT) tlscommon.$(OBJEXT) \
tlv11.$(OBJEXT) udp.$(OBJEXT) util.$(OBJEXT)
librsp_a_OBJECTS = $(am_librsp_a_OBJECTS)
@WANT_FTICKS_TRUE@am__EXEEXT_1 = radsecproxy-hash$(EXEEXT)
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" \
......@@ -287,14 +283,30 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
@WANT_FTICKS_TRUE@fticks_sources = fticks.c fticks.h fticks_hashmac.c fticks_hashmac.h
@WANT_FTICKS_TRUE@fticks_programs = radsecproxy-hash
@WANT_FTICKS_TRUE@radsecproxy_hash_LDADD = fticks_hashmac.o hash.o list.o
@HAVE_DOCBOOK2X_MAN_TRUE@GENMANPAGES = radsecproxy.conf.5
SUBDIRS = tests
noinst_LIBRARIES = librsp.a
radsecproxy_SOURCES = main.c
librsp_a_SOURCES = debug.c debug.h dtls.c dtls.h gconfig.c gconfig.h \
hash.c hash.h hostport.c hostport.h list.c list.h radmsg.c \
radmsg.h radsecproxy.c radsecproxy.h tcp.c tcp.h tls.c tls.h \
tlscommon.c tlscommon.h tlv11.c tlv11.h udp.c udp.h util.c \
util.h $(am__append_1)
librsp_a_SOURCES = \
$(fticks_sources) \
debug.c debug.h \
dtls.c dtls.h \
gconfig.c gconfig.h \
hash.c hash.h \
hostport.c hostport.h \
list.c list.h \
radmsg.c radmsg.h \
radsecproxy.c radsecproxy.h \
tcp.c tcp.h \
tls.c tls.h \
tlscommon.c tlscommon.h \
tlv11.c tlv11.h \
udp.c udp.h \
util.c util.h
radsecproxy_conf_SOURCES = \
catgconf.c \
debug.c debug.h \
......@@ -303,22 +315,22 @@ radsecproxy_conf_SOURCES = \
####################
AM_CPPFLAGS = -DSYSCONFDIR=\"$(sysconfdir)\"
AM_CFLAGS = \
-g -Wall -Werror -fno-strict-aliasing @SSL_CFLAGS@ @TARGET_CFLAGS@
radsecproxy_LDFLAGS = @SSL_LDFLAGS@ @TARGET_LDFLAGS@
radsecproxy_LDADD = librsp.a @SSL_LIBS@
radsecproxy_conf_LDFLAGS = @TARGET_LDFLAGS@
####################
@HAVE_DOCBOOK2X_MAN_TRUE@GENMANPAGES = radsecproxy.conf.5
dist_man_MANS = radsecproxy.1 radsecproxy-hash.1 $(GENMANPAGES)
EXTRA_DIST = configure Makefile.in tests/Makefile.in compile \
config.guess config.sub install-sh missing depcomp LICENSE \
THANKS radsecproxy.conf.5.xml radsecproxy.conf-example \
EXTRA_DIST = \
LICENSE THANKS \
configure Makefile.in tests/Makefile.in \
compile config.guess config.sub install-sh missing depcomp \
radsecproxy.conf.5.xml radsecproxy.conf-example \
tools/README tools/naptr-eduroam.sh tools/radsec-dynsrv.sh
DISTCHECK_CONFIGURE_FLAGS = --enable-fticks
@WANT_FTICKS_TRUE@radsecproxy_hash_LDADD = fticks_hashmac.o hash.o list.o
all: all-recursive
.SUFFIXES:
......
This is radsecproxy 1.5 from Oct 8 2011.
This is radsecproxy 1.6 from April 27 2012.
radsecproxy is a generic RADIUS proxy that supports both UDP and TLS
(RadSec) RADIUS transports. There is also experimental support for
......@@ -24,13 +24,14 @@ instructions, please see the enclosed example file and the
documentation at
http://software.uninett.no/radsecproxy/?page=documentation
There are five options that may be specified on the command line:
The following options may be specified on the command line:
"-c configfile" to specify a non-default config file path.
"-d loglevel" to set a loglevel of 1, 2, 3, 4 and 5 where 5 is the
most detailed.
"-f" to run the proxy in the foreground with logging to stderr.
Without "-f" the default is to detach as a daemon and log to
syslog.
"-i pidfile" to name a file to which the PID is written.
"-v" just prints version information and exits.
"-p" (pretend) makes the proxy go through the configuration files as
normal, but stops before creating any sockets or doing any
......
......@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
[m4_warning([this file was generated for autoconf 2.67.
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
[m4_warning([this file was generated for autoconf 2.65.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
......@@ -639,41 +639,6 @@ AC_MSG_RESULT([$_am_result])
rm -f confinc confmf
])
# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# serial 6
# AM_PROG_CC_C_O
# --------------
# Like AC_PROG_CC_C_O, but changed for automake.
AC_DEFUN([AM_PROG_CC_C_O],
[AC_REQUIRE([AC_PROG_CC_C_O])dnl
AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
AC_REQUIRE_AUX_FILE([compile])dnl
# FIXME: we rely on the cache variable name because
# there is no other way.
set dummy $CC
am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
if test "$am_t" != yes; then
# Losing compiler, so override with the script.
# FIXME: It is wrong to rewrite CC.
# But if we don't then we get into trouble of one sort or another.
# A longer-term fix would be to have automake use am__CC in this case,
# and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
CC="$am_aux_dir/compile $CC"
fi
dnl Make sure AC_PROG_CC is never called again, or it will override our
dnl setting of CC.
m4_define([AC_PROG_CC],
[m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
])
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
......
/*
* Copyright (C) 2008 Stig Venaas <venaas@uninett.no>
* Copyright (C) 2010,2011,2012 NORDUnet A/S
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*/
#include <stdio.h>
#include <string.h>
#include <unistd.h>
......@@ -5,16 +14,17 @@
#include "debug.h"
#include "gconfig.h"
void listconfig(struct gconffile **cf, char *block, int compact) {
int listconfig(struct gconffile **cf, char *block, int compact) {
char *opt = NULL, *val = NULL;
int conftype;
for (;;) {
free(opt);
free(val);
getconfigline(cf, block, &opt, &val, &conftype);
if (!opt)
return;
if (!getconfigline(cf, block, &opt, &val, &conftype))
return -1;
if (!opt)
return 0; /* Success. */
if (conftype == CONF_STR && !strcasecmp(opt, "include")) {
if (!pushgconfpaths(cf, val))
......@@ -31,13 +41,17 @@ void listconfig(struct gconffile **cf, char *block, int compact) {
break;
case CONF_CBK:
printf("%s %s {%s", opt, val, compact ? "" : "\n");
listconfig(cf, val, compact);
if (listconfig(cf, val, compact))
return -1;
printf("}\n");
break;
default:
printf("Unsupported config type\n");
return -1;
}
}
return 0; /* Success. */
}
int main(int argc, char **argv) {
......@@ -60,8 +74,7 @@ int main(int argc, char **argv) {
goto usage;
cfs = openconfigfile(argv[optind]);
listconfig(&cfs, NULL, compact);
return 0;
return listconfig(&cfs, NULL, compact);
usage:
debug(DBG_ERR, "Usage:\n%s [ -c ] configfile", argv[0]);
......
#! /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
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
# Free Software Foundation, Inc.
timestamp='2009-12-30'
timestamp='2009-06-10'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
......@@ -27,16 +27,16 @@ timestamp='2009-12-30'
# 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 <config-patches@gnu.org> and include a ChangeLog
# entry.
# Originally written by Per Bothner <per@bothner.com>.
# Please send patches to <config-patches@gnu.org>. Submit a context
# diff and a properly formatted ChangeLog entry.
#
# 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,.*/,,'`
......@@ -56,9 +56,8 @@ version="\
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 Free
Software Foundation, Inc.
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
......@@ -334,9 +333,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
i86pc: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"
......@@ -811,12 +807,12 @@ EOF
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
*:Interix*:*)
*:Interix*:[3456]*)
case ${UNAME_MACHINE} in
x86)
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
authenticamd | genuineintel | EM64T)
EM64T | authenticamd | genuineintel)
echo x86_64-unknown-interix${UNAME_RELEASE}
exit ;;
IA64)
......@@ -858,20 +854,6 @@ EOF
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix
exit ;;
alpha:Linux:*:*)
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
EV5) UNAME_MACHINE=alphaev5 ;;
EV56) UNAME_MACHINE=alphaev56 ;;
PCA56) UNAME_MACHINE=alphapca56 ;;
PCA57) UNAME_MACHINE=alphapca56 ;;
EV6) UNAME_MACHINE=alphaev6 ;;
EV67) UNAME_MACHINE=alphaev67 ;;
EV68*) UNAME_MACHINE=alphaev68 ;;
esac
objdump --private-headers /bin/sh | grep -q ld.so.1
if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
exit ;;
arm*:Linux:*:*)
eval $set_cc_for_build
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
......@@ -894,17 +876,6 @@ EOF
frv:Linux:*:*)
echo frv-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 ;;
......@@ -930,18 +901,39 @@ EOF
#endif
#endif
EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
/^CPU/{
s: ::g
p
}'`"
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
or32:Linux:*:*)
echo or32-unknown-linux-gnu
exit ;;
ppc:Linux:*:*)
echo powerpc-unknown-linux-gnu
exit ;;
ppc64:Linux:*:*)
echo powerpc64-unknown-linux-gnu
exit ;;
alpha:Linux:*:*)
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
EV5) UNAME_MACHINE=alphaev5 ;;
EV56) UNAME_MACHINE=alphaev56 ;;
PCA56) UNAME_MACHINE=alphapca56 ;;
PCA57) UNAME_MACHINE=alphapca56 ;;
EV6) UNAME_MACHINE=alphaev6 ;;
EV67) UNAME_MACHINE=alphaev67 ;;
EV68*) UNAME_MACHINE=alphaev68 ;;
esac
objdump --private-headers /bin/sh | grep -q ld.so.1
if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
exit ;;
padre:Linux:*:*)
echo sparc-unknown-linux-gnu
exit ;;
parisc64:Linux:*:* | hppa64:Linux:*:*)
echo hppa64-unknown-linux-gnu
exit ;;
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
......@@ -950,11 +942,8 @@ EOF
*) echo hppa-unknown-linux-gnu ;;
esac
exit ;;
ppc64:Linux:*:*)
echo powerpc64-unknown-linux-gnu
exit ;;
ppc:Linux:*:*)
echo powerpc-unknown-linux-gnu
parisc64:Linux:*:* | hppa64:Linux:*:*)
echo hppa64-unknown-linux-gnu
exit ;;
s390:Linux:*:* | s390x:Linux:*:*)
echo ${UNAME_MACHINE}-ibm-linux
......@@ -977,6 +966,58 @@ EOF
xtensa*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
i*86:Linux:*:*)
# The BFD linker knows what the default object file format is, so
# first see if it will tell us. cd to the root directory to prevent
# 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"
;;
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
#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
LIBC=gnu
#else
LIBC=gnuaout
#endif
#endif
#ifdef __dietlibc__
LIBC=dietlibc
#endif
EOF
eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
/^LIBC/{
s: ::g
p
}'`"
test x"${LIBC}" != x && {
echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
exit
}
test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
;;
i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
# earlier versions are messed up and put the nodename in both
......@@ -1206,16 +1247,6 @@ EOF
*: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}
......
#! /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
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
# Free Software Foundation, Inc.
timestamp='2010-01-22'
timestamp='2009-06-11'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
......@@ -32,16 +32,13 @@ timestamp='2010-01-22'
# Please send patches to <config-patches@gnu.org>. 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.
......@@ -75,9 +72,8 @@ Report bugs and patches to <config-patches@gnu.org>."
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 Free
Software Foundation, Inc.
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
......@@ -153,7 +149,7 @@ case $os in
-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 | -knuth | -cray)
os=
basic_machine=$1
;;
......@@ -288,7 +284,6 @@ case $basic_machine in
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
| 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 \
......@@ -296,14 +291,13 @@ case $basic_machine in
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
| spu | strongarm \
| tahoe | thumb | tic4x | tic80 | tron \
| ubicom32 \
| v850 | v850e \
| we32k \
| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
| z8k | z80)
basic_machine=$basic_machine-unknown
;;
m6811 | m68hc11 | m6812 | m68hc12 | picochip)
m6811 | m68hc11 | m6812 | m68hc12)
# Motorola 68HC11/12.
basic_machine=$basic_machine-unknown
os=-none
......@@ -346,7 +340,7 @@ case $basic_machine in
| lm32-* \
| m32c-* | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
| mips16-* \
| mips64-* | mips64el-* \
......@@ -374,17 +368,15 @@ case $basic_machine in
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
| pyramid-* \
| romp-* | rs6000-* | rx-* \
| romp-* | rs6000-* \
| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
| sparclite-* \
| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
| tahoe-* | thumb-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
| tile-* | tilegx-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
| tron-* \
| ubicom32-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
......@@ -734,9 +726,6 @@ case $basic_machine in
basic_machine=ns32k-utek
os=-sysv
;;
microblaze)
basic_machine=microblaze-xilinx
;;
mingw32)
basic_machine=i386-pc
os=-mingw32
......@@ -1087,11 +1076,6 @@ case $basic_machine in
basic_machine=tic6x-unknown
os=-coff
;;
# This must be matched before tile*.
tilegx*)
basic_machine=tilegx-unknown
os=-linux-gnu
;;
tile*)
basic_machine=tile-unknown
os=-linux-gnu
......@@ -1263,9 +1247,6 @@ case $os in
# First match some system type aliases
# that might get confused with valid system types.
# -solaris* is a basic system type, with this one exception.
-auroraux)
os=-auroraux
;;
-solaris1 | -solaris1.*)
os=`echo $os | sed -e 's|solaris1|sunos4|'`
;;
......@@ -1287,8 +1268,8 @@ case $os in
# -sysv* is not here because it comes later, after sysvr4.
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
| -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
| -sym* | -kopensolaris* \
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
| -kopensolaris* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
| -aos* | -aros* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
......@@ -1309,7 +1290,7 @@ case $os in
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
| -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
| -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
......@@ -1442,8 +1423,6 @@ case $os in
-dicos*)
os=-dicos
;;
-nacl*)
;;