Changes - j0ke.net Open Build Service

Changes of Revision 5

[-] [+]	Changed	radvd.changes
@@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu May 10 10:25:39 UTC 2012 - cs@linux-administrator.com + +- Update to version 1.8.5 + +------------------------------------------------------------------- Mon Oct 24 17:26:13 UTC 2011 - cs@linux-administrator.com - Update to version 1.8.3
[-] [+]	Changed	radvd.spec ^
@@ -10,7 +10,7 @@ Summary: A Router Advertisement daemon Name: radvd -Version: 1.8.3 +Version: 1.8.5 Release: 1 # The code includes the advertising clause, so it's GPL-incompatible License: BSD with advertising
[-] [+]	Deleted	radvd-1.8.3.tar.bz2/configure.in ^
@@ -1,205 +0,0 @@ -dnl -dnl $Id: configure.in,v 1.25 2011/02/25 06:14:05 reubenhwk Exp $ -dnl -dnl Authors: -dnl Lars Fenneberg <lf@elemental.net> -dnl -dnl This software is Copyright 1996-2000 by the above mentioned author(s), -dnl All Rights Reserved. -dnl -dnl The license which is distributed with this software in the file COPYRIGHT -dnl applies to this software. If your distribution is missing this file, you -dnl may request it from <pekkas@netcore.fi>. -dnl -dnl - -AC_REVISION ($Id: configure.in,v 1.25 2011/02/25 06:14:05 reubenhwk Exp $) -AC_INIT(radvd.c) - -AC_CANONICAL_SYSTEM -VERSION=`cat ${srcdir}/VERSION \| grep -v '^#' \| tr -d '\012'` -AM_INIT_AUTOMAKE(radvd,$VERSION,true) -m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES(yes)]) - -AC_MSG_CHECKING([architecture]) -case "$target" in - linux) - AC_MSG_RESULT(linux) - AC_DEFINE([_GNU_SOURCE], [], [whether compiling on Linux, glibc>=2.8 doesn't expose in6_pktinfo otherwise..]) - arch=linux - ;; - bsd) - AC_MSG_RESULT(bsd44) - arch=bsd44 - ;; - darwin) - AC_MSG_RESULT([bsd44 (darwin)]) - arch=bsd44 - ;; - ) - AC_MSG_RESULT(unknown: $target) - AC_MSG_ERROR( -[currently only Linux and BSD 4.4 with NRL's IPv6 code are -supported. If you have such a system and it is not guessed correctly -you must specifiy it with --target on the configure command line]) - ;; -esac - -dnl Determine CC and preset CFLAGS -AC_PROG_CC - -dnl Determine of netlink is available -AC_MSG_CHECKING(netlink) -AC_TRY_COMPILE([ -#include <asm/types.h> -#include <sys/socket.h> -#include <linux/netlink.h> -#include <linux/rtnetlink.h> -],[ -int -main(int argc, char argv[]) -{ - int sock; - struct sockaddr_nl snl; - - sock = socket(PF_NETLINK, SOCK_RAW, NETLINK_ROUTE); - - snl.nl_family = AF_NETLINK; - snl.nl_groups = RTMGRP_LINK; - - return 0; -} -],[ -AC_DEFINE(HAVE_NETLINK, 1, [Linux netlink]) -CONDITIONAL_SOURCES=netlink.${OBJEXT} -AC_MSG_RESULT(yes) -],[ -AC_MSG_RESULT(no) -]) - -dnl Needed for normal compile -AC_PROG_INSTALL -AC_PATH_PROG(RM, rm, NOTFOUND) -if test "x$RM" = xNOTFOUND; then - AC_MSG_ERROR(can't find rm in your path - check PATH) -fi -AC_PATH_PROG(SED, sed, NOTFOUND) -if test "x$SED" = xNOTFOUND; then - AC_MSG_ERROR(can't find sed in your path - check PATH) -fi -dnl Not needed -AC_PATH_PROG(LN, ln) -AC_PROG_YACC -AM_PROG_LEX -AC_PATH_PROG(TAR, tar) -AC_PATH_PROG(GZIP, gzip) - -dnl Check where to put the logfile -AC_MSG_CHECKING(where to put logfile) -AC_ARG_WITH(logfile, -[ --with-logfile Path to the radvd logfile [/var/log/radvd.log]], - PATH_RADVD_LOG=$withval, - PATH_RADVD_LOG=/var/log/radvd.log) -AC_MSG_RESULT($PATH_RADVD_LOG) - -dnl Check where to put the pidfile -AC_MSG_CHECKING(where to put pidfile) -AC_ARG_WITH(pidfile, -[ --with-pidfile Path to the radvd pidfile [/var/run/radvd.pid]], - PATH_RADVD_PID=$withval, - PATH_RADVD_PID=/var/run/radvd.pid) -AC_MSG_RESULT($PATH_RADVD_PID) - -dnl Check where to put the configfile -AC_MSG_CHECKING(where to find configfile) -AC_ARG_WITH(configfile, -[ --with-configfile Path to the radvd config file [SYSCONF/radvd.conf]], - PATH_RADVD_CONF=$withval, - [eval PATH_RADVD_CONF=${sysconfdir}/radvd.conf]) -PATH_RADVD_CONF=$(echo $PATH_RADVD_CONF \| sed 's/NONE//1') -AC_MSG_RESULT($PATH_RADVD_CONF) - -dnl Checking which syslog facility to use -AC_MSG_CHECKING(which syslog facility to use) -AC_ARG_WITH(facility, -[ --with-facility Syslog facility to use when using syslog logging], - LOG_FACILITY=$withval, - LOG_FACILITY=LOG_DAEMON) -AC_MSG_RESULT($LOG_FACILITY) - -dnl Checks for libraries. - -AC_CHECK_LIB(c, inet_ntop,, - AC_CHECK_LIB(inet6, inet_ntop, - LIBS="$LIBS -linet6" - , - AC_MSG_ERROR(can't continue without libinet6.a library - check your LDFLAGS) - ) -) -# prevent caching -unset ac_cv_lib_inet6_inet_ntop - -dnl Checks for header files. -AC_HEADER_STDC -AC_CHECK_HEADERS( \ - getopt.h \ - ifaddrs.h \ - machine/limits.h \ - machine/param.h \ - net/if_arp.h \ - net/if_dl.h \ - net/if_types.h \ - sys/param.h \ - sys/sockio.h \ - sys/time.h \ - time.h \ -) -AC_HEADER_TIME - -dnl Checks for typedefs, structures, and compiler characteristics. -AC_C_CONST - -AC_MSG_CHECKING(whether struct sockaddr_in6 has sin6_scope_id) -AC_TRY_COMPILE([#include <sys/types.h> -#include <netinet/in.h>], [static struct sockaddr_in6 ac_sin6; int ac_size = -sizeof (ac_sin6.sin6_scope_id);], [AC_MSG_RESULT(yes); AC_DEFINE([HAVE_SIN6_SCOPE_ID], -1, [whether struct sockaddr_in6 has sin6_scope_id])], -AC_MSG_RESULT(no)) - -AC_MSG_CHECKING(whether struct in6_addr has u6_addrXX and defines s6_addrXX) -AC_TRY_COMPILE([#include <netinet/in.h>], [static struct in6_addr in6_u; -int u = in6_u.s6_addr16;], [AC_MSG_RESULT(yes); AC_DEFINE([HAVE_IN6_ADDR_S6_ADDR], -1, [whether struct in6_addr has u6_addrXX and defines s6_addrXX])], -AC_MSG_RESULT(no)) - -dnl Checks for library functions. -AC_CHECK_FUNCS(getopt_long) - -CONDITIONAL_SOURCES="device-${arch}.${OBJEXT} privsep-${arch}.${OBJEXT} ${CONDITIONAL_SOURCES}" -AC_SUBST(CONDITIONAL_SOURCES) - -AC_SUBST(VERSION) -AC_SUBST(PATH_RADVD_CONF) -AC_SUBST(PATH_RADVD_PID) -AC_SUBST(PATH_RADVD_LOG) -AC_SUBST(LOG_FACILITY) - -AM_CONFIG_HEADER(config.h) -AC_OUTPUT(Makefile) - -cat << EOF - -Your build configuration: - - CFLAGS = $CFLAGS - LDFLAGS = $LDFLAGS - Arch = ${arch} - Extras: ${CONDITIONAL_SOURCES} - prefix: $prefix - PID file: $PATH_RADVD_PID - Log file: $PATH_RADVD_LOG - Config file: $PATH_RADVD_CONF - Radvd version: $VERSION - -EOF -
[-] [+]	Deleted	radvd-1.8.3.tar.bz2/privsep-bsd44.c ^
@@ -1,34 +0,0 @@ -/* - * $Id: privsep-bsd44.c,v 1.2 2010/12/14 11:58:21 psavola Exp $ - * - * Authors: - * Jim Paris <jim@jtan.com> - * Pedro Roque <roque@di.fc.ul.pt> - * Lars Fenneberg <lf@elemental.net> - * - * This software is Copyright 1996,1997,2008 by the above mentioned author(s), - * All Rights Reserved. - * - * The license which is distributed with this software in the file COPYRIGHT - * applies to this software. If your distribution is missing this file, you - * may request it from <pekkas@netcore.fi>. - * - / - -#include "config.h" -#include "includes.h" -#include "radvd.h" -#include "pathnames.h" - -/ Not available */ -int -privsep_init(void) -{ - return 0; -} - -int -privsep_enabled(void) -{ - return 0; -}
[-] [+]	Changed	radvd-1.8.5.tar.bz2/CHANGES ^
@@ -1,4 +1,17 @@ -14/08/2011 1.8.3 release +25/01/2012 PID in PID file is now correct + 1.8.5rc1 + +21/01/2012 1.8.4 released + +12/01/2012 renaming configure.in to configure.ac + removing CVS keywords + 1.8.4rc1 + +07/01/2012 Always do privsep on linux. Validate the PID file contents. + +02/11/2011 Adding --nodaemon option + +14/10/2011 1.8.3 release 08/10/2011 More careful checking of iface name
[-] [+]	Changed	radvd-1.8.5.tar.bz2/Makefile.am ^
@@ -1,5 +1,4 @@ # -# $Id: Makefile.am,v 1.22 2011/05/09 11:04:12 psavola Exp $ # # Authors: # Lars Fenneberg <lf@elemental.net> @@ -58,7 +57,6 @@ device-linux.c \ netlink.c \ netlink.h \ - privsep-bsd44.c \ privsep-linux.c radvd_LDADD = \
[-] [+]	Changed	radvd-1.8.5.tar.bz2/Makefile.in ^
@@ -16,7 +16,6 @@ @SET_MAKE@ # -# $Id: Makefile.am,v 1.22 2011/05/09 11:04:12 psavola Exp $ # # Authors: # Lars Fenneberg <lf@elemental.net> @@ -56,7 +55,7 @@ $(top_srcdir)/configure TODO config.guess config.sub depcomp \ gram.c gram.h install-sh missing scanner.c ylwrap ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ @@ -302,7 +301,6 @@ device-linux.c \ netlink.c \ netlink.h \ - privsep-bsd44.c \ privsep-linux.c radvd_LDADD = \ @@ -474,7 +472,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/interface.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/log.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netlink.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/privsep-bsd44.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/privsep-linux.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/process.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/radvd.Po@am__quote@
[-] [+]	Changed	radvd-1.8.5.tar.bz2/README ^
@@ -1,4 +1,3 @@ -$Id: README,v 1.9 2005/12/31 16:10:05 psavola Exp $ Installation: =============
[-] [+]	Changed	radvd-1.8.5.tar.bz2/TODO ^
@@ -1,4 +1,3 @@ -$Id: TODO,v 1.36 2010/12/14 12:40:18 psavola Exp $ NOTE WELL =========
[-] [+]	Changed	radvd-1.8.5.tar.bz2/VERSION ^
@@ -1,6 +1,5 @@ # -# $Id: VERSION,v 1.32 2011/05/14 14:08:31 reubenhwk Exp $ # # this file is automatically processed by configure # -1.8.3 +1.8.5
[-] [+]	Changed	radvd-1.8.5.tar.bz2/aclocal.m4 ^
@@ -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.65],, -[m4_warning([this file was generated for autoconf 2.65. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, +[m4_warning([this file was generated for autoconf 2.68. 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'.])])
[-] [+]	Changed	radvd-1.8.5.tar.bz2/config.guess ^
@@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 -# Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011 Free Software Foundation, Inc. -timestamp='2009-06-10' +timestamp='2011-05-11' # 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 @@ # the same distribution terms that you use for the rest of that program. -# Originally written by Per Bothner <per@bothner.com>. -# Please send patches to <config-patches@gnu.org>. Submit a context -# diff and a properly formatted ChangeLog entry. +# Originally written by Per Bothner. Please send patches (context +# diff format) to <config-patches@gnu.org> and include a 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. # -# The plan is that this can be called by configure scripts if you -# don't specify an explicit build system type. +# 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 me=`echo "$0" \| sed -e 's,./,,'` @@ -56,8 +56,9 @@ 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 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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." @@ -180,7 +181,7 @@ fi ;; ) - os=netbsd + os=netbsd ;; esac # The OS release @@ -223,7 +224,7 @@ UNAME_RELEASE=`/usr/sbin/sizer -v \| awk '{print $3}'` ;; 5.) - UNAME_RELEASE=`/usr/sbin/sizer -v \| awk '{print $4}'` + UNAME_RELEASE=`/usr/sbin/sizer -v \| awk '{print $4}'` ;; esac # According to Compaq, /usr/sbin/psrinfo has been available on @@ -269,7 +270,10 @@ # 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'` - exit ;; + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 + exit $exitcode ;; 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 @@ -295,7 +299,7 @@ echo s390-ibm-zvmoe exit ;; :OS400::) - echo powerpc-ibm-os400 + echo powerpc-ibm-os400 exit ;; arm:RISC:1.[012]:\|arm:riscix:1.[012]:) echo arm-acorn-riscix${UNAME_RELEASE} @@ -333,6 +337,9 @@ 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" @@ -391,23 +398,23 @@ # 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} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; atari:MiNT::* \| atari:mint:: \| atarist[e]:TOS::) echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + exit ;; falcon:MiNT:: \| falcon:mint::* \| falcon:TOS::) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; milan:MiNT::* \| milan:mint:: \| milan:TOS::) - echo m68k-milan-mint${UNAME_RELEASE} - exit ;; + echo m68k-milan-mint${UNAME_RELEASE} + exit ;; hades:MiNT::* \| hades:mint:: \| hades:TOS::) - echo m68k-hades-mint${UNAME_RELEASE} - exit ;; + echo m68k-hades-mint${UNAME_RELEASE} + exit ;; :MiNT::* \| :mint:: \| :TOS::) - echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; + echo m68k-unknown-mint${UNAME_RELEASE} + exit ;; m68k:machten::) echo m68k-apple-machten${UNAME_RELEASE} exit ;; @@ -477,8 +484,8 @@ echo m88k-motorola-sysv3 exit ;; 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 ] \|\| \ @@ -491,7 +498,7 @@ else echo i586-dg-dgux${UNAME_RELEASE} fi - exit ;; + exit ;; M88:DolphinOS::) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 exit ;; @@ -548,7 +555,7 @@ echo rs6000-ibm-aix3.2 fi exit ;; - :AIX::[456]) + :AIX::[4567]) 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 @@ -591,52 +598,52 @@ 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 + sed 's/^ //' << EOF >$dummy.c + + #define _HPUX_SOURCE + #include <stdlib.h> + #include <unistd.h> - #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); - } + 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 @@ -727,22 +734,22 @@ exit ;; C1:ConvexOS:: \| convex:ConvexOS:C1:) echo c1-convex-bsd - exit ;; + exit ;; C2:ConvexOS::* \| convex:ConvexOS:C2:) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit ;; + exit ;; C34:ConvexOS::* \| convex:ConvexOS:C34:) echo c34-convex-bsd - exit ;; + exit ;; C38:ConvexOS::* \| convex:ConvexOS:C38:) echo c38-convex-bsd - exit ;; + exit ;; C4:ConvexOS::* \| convex:ConvexOS:C4:) echo c4-convex-bsd - exit ;; + exit ;; CRAYY-MP:::) echo ymp-cray-unicos${UNAME_RELEASE} \| sed -e 's/\.[^.]$/.X/' exit ;; @@ -766,14 +773,14 @@ exit ;; F30[01]:UNIX_System_V::* \| F700:UNIX_System_V::) FUJITSU_PROC=`uname -m \| tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p \| tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' \| sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} \| sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + 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}" + 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 ;; i86:BSD/386::* \| i86:BSD/OS::* \| :Ascend\ Embedded/OS::) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} @@ -801,18 +808,18 @@ echo ${UNAME_MACHINE}-pc-mingw32 exit ;; i:windows32:) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 exit ;; i:PW:) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - :Interix:[3456]) - case ${UNAME_MACHINE} in + :Interix:) + case ${UNAME_MACHINE} in x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; - EM64T \| authenticamd \| genuineintel) + authenticamd \| genuineintel \| EM64T) echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; IA64) @@ -854,6 +861,20 @@ i86: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 \ @@ -861,7 +882,13 @@ then echo ${UNAME_MACHINE}-unknown-linux-gnu else - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + 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::) @@ -874,7 +901,18 @@ echo crisv32-axis-linux-gnu exit ;; frv:Linux::) - echo frv-unknown-linux-gnu + echo frv-unknown-linux-gnu + exit ;; + i86: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 @@ -901,39 +939,18 @@ #endif #endif EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null \| sed -n ' - /^CPU/{ - s: ::g - p - }'`" + 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 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 @@ -942,14 +959,17 @@ ) echo hppa-unknown-linux-gnu ;; esac exit ;; - parisc64:Linux:: \| hppa64:Linux::) - echo hppa64-unknown-linux-gnu + ppc64:Linux::) + echo powerpc64-unknown-linux-gnu + exit ;; + ppc:Linux::) + echo powerpc-unknown-linux-gnu exit ;; s390:Linux:: \| s390x:Linux::) echo ${UNAME_MACHINE}-ibm-linux exit ;; sh64:Linux::) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; sh:Linux::) echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -957,6 +977,9 @@ sparc:Linux:: \| sparc64:Linux::) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; + tile:Linux::) + echo ${UNAME_MACHINE}-tilera-linux-gnu + exit ;; vax:Linux::) echo ${UNAME_MACHINE}-dec-linux-gnu exit ;; @@ -964,60 +987,8 @@ echo x86_64-unknown-linux-gnu exit ;; xtensa:Linux::) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; - i86: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; } - ;; i86: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 @@ -1025,11 +996,11 @@ echo i386-sequent-sysv4 exit ;; i86: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 ;; i86:OS/2::) @@ -1061,7 +1032,7 @@ fi exit ;; i86::5:[678]) - # UnixWare 7.x, OpenUNIX and OpenServer 6. + # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X \| grep "^Machine"` in 486) UNAME_MACHINE=i486 ;; Pentium) UNAME_MACHINE=i586 ;; @@ -1089,13 +1060,13 @@ exit ;; pc:::) # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i586. + # 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 ;; + exit ;; Intel:Mach:3:) echo i386-pc-mach3 exit ;; @@ -1130,8 +1101,8 @@ /bin/uname -p 2>/dev/null \| /bin/grep entium >/dev/null \ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??::4.0: \| 3[34]??,::4.0:) - /bin/uname -p 2>/dev/null \| grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; + /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 \ @@ -1174,10 +1145,10 @@ echo ns32k-sni-sysv fi exit ;; - PENTIUM::4.0:) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says <Richard.M.Bartel@ccMail.Census.GOV> - echo i586-unisys-sysv4 - exit ;; + PENTIUM::4.0:) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says <Richard.M.Bartel@ccMail.Census.GOV> + echo i586-unisys-sysv4 + exit ;; :UNIX_System_V:4:FTX) # From Gerald Hewes <hewes@openmarket.com>. # How about differentiating between stratus architectures? -djm @@ -1203,11 +1174,11 @@ exit ;; R[34]000:System_V:: \| R4000:UNIX_SYSV:: \| R000: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 ;; BeBox:BeOS::) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos exit ;; @@ -1247,6 +1218,16 @@ :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} @@ -1262,6 +1243,9 @@ :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 ;; @@ -1307,13 +1291,13 @@ echo pdp10-unknown-its exit ;; SEI:::SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} + 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` + UNAME_MACHINE=`(uname -p) 2>/dev/null` case "${UNAME_MACHINE}" in A) echo alpha-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;; @@ -1353,11 +1337,11 @@ #include <sys/param.h> printf ("m68k-sony-newsos%s\n", #ifdef NEWSOS4 - "4" + "4" #else - "" + "" #endif - ); exit (0); + ); exit (0); #endif #endif
[-] [+]	Changed	radvd-1.8.5.tar.bz2/config.h.in ^
@@ -1,4 +1,4 @@ -/* config.h.in. Generated from configure.in by autoheader. / +/ config.h.in. Generated from configure.ac by autoheader. / / Define to 1 if you have the <getopt.h> header file. / #undef HAVE_GETOPT_H @@ -99,6 +99,9 @@ / Define to 1 if you can safely include both <sys/time.h> and <time.h>. / #undef TIME_WITH_SYS_TIME +/ Use privsep / +#undef USE_PRIVSEP + / Define to 1 if `lex' declares `yytext' as a `char ' by default, not a `char[]'. / #undef YYTEXT_POINTER
[-] [+]	Changed	radvd-1.8.5.tar.bz2/config.sub ^
@@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 -# Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011 Free Software Foundation, Inc. -timestamp='2009-06-11' +timestamp='2011-03-23' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -32,13 +32,16 @@ # Please send patches to <config-patches@gnu.org>. Submit a context -# diff and a properly formatted ChangeLog entry. +# diff and a properly formatted GNU 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. @@ -72,8 +75,9 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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." @@ -120,8 +124,9 @@ # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 \| sed 's/^$.$-$[^-]-[^-]$$/\2/'` case $maybe_os in - nto-qnx \| linux-gnu* \| linux-dietlibc \| linux-newlib* \| linux-uclibc* \| \ - uclinux-uclibc* \| uclinux-gnu* \| kfreebsd-gnu \| knetbsd-gnu \| netbsd-gnu \| \ + 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) os=-$maybe_os @@ -149,12 +154,12 @@ -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) + -apple \| -axis \| -knuth \| -cray \| -microblaze) os= basic_machine=$1 ;; - -bluegene) - os=-cnk + -bluegene) + os=-cnk ;; -sim \| -cisco \| -oki \| -wec \| -winbond) os= @@ -170,10 +175,10 @@ os=-chorusos basic_machine=$1 ;; - -chorusrdb) - os=-chorusrdb + -chorusrdb) + os=-chorusrdb basic_machine=$1 - ;; + ;; -hiux) os=-hiuxwe2 ;; @@ -278,26 +283,39 @@ \| moxie \ \| mt \ \| msp430 \ + \| nds32 \| nds32le \| nds32be \ \| nios \| nios2 \ \| ns16k \| ns32k \ + \| open8 \ \| or32 \ \| pdp10 \| pdp11 \| pj \| pjl \ - \| powerpc \| powerpc64 \| powerpc64le \| powerpcle \| ppcbe \ + \| powerpc \| powerpc64 \| powerpc64le \| powerpcle \ \| 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 \ \| sparc \| sparc64 \| sparc64b \| sparc64v \| sparc86x \| sparclet \| sparclite \ \| sparcv8 \| sparcv9 \| sparcv9b \| sparcv9v \ - \| spu \| strongarm \ - \| tahoe \| thumb \| tic4x \| tic80 \| tron \ + \| spu \ + \| tahoe \| tic4x \| tic54x \| tic55x \| tic6x \| tic80 \| tron \ + \| ubicom32 \ \| v850 \| v850e \ \| we32k \ - \| x86 \| xc16x \| xscale \| xscalee[bl] \| xstormy16 \| xtensa \ + \| x86 \| xc16x \| xstormy16 \| xtensa \ \| z8k \| z80) basic_machine=$basic_machine-unknown ;; - m6811 \| m68hc11 \| m6812 \| m68hc12) + c54x) + basic_machine=tic54x-unknown + ;; + c55x) + basic_machine=tic55x-unknown + ;; + c6x) + basic_machine=tic6x-unknown + ;; + m6811 \| m68hc11 \| m6812 \| m68hc12 \| picochip) # Motorola 68HC11/12. basic_machine=$basic_machine-unknown os=-none @@ -308,6 +326,18 @@ basic_machine=mt-unknown ;; + strongarm \| thumb \| xscale) + basic_machine=arm-unknown + ;; + + xscaleeb) + basic_machine=armeb-unknown + ;; + + xscaleel) + basic_machine=armel-unknown + ;; + # We use `pc' rather than `unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. @@ -328,7 +358,7 @@ \| arm- \| armbe-* \| armle-* \| armeb-* \| armv- \ \| avr-* \| avr32-* \ \| bfin-* \| bs2000-* \ - \| c[123]* \| c30-* \| [cjt]90-* \| c4x-* \| c54x-* \| c55x-* \| c6x-* \ + \| c[123]* \| c30-* \| [cjt]90-* \| c4x-* \ \| clipper-* \| craynv-* \| cydra-* \ \| d10v-* \| d30v-* \| dlx-* \ \| elxsi-* \ @@ -340,7 +370,7 @@ \| lm32-* \ \| m32c-* \| m32r-* \| m32rle-* \ \| m68000-* \| m680[012346]0-* \| m68360-* \| m683?2-* \| m68k-* \ - \| m88110-* \| m88k-* \| maxq-* \| mcore-* \| metag-* \ + \| m88110-* \| m88k-* \| maxq-* \| mcore-* \| metag-* \| microblaze-* \ \| mips-* \| mipsbe-* \| mipseb-* \| mipsel-* \| mipsle-* \ \| mips16-* \ \| mips64-* \| mips64el-* \ @@ -362,24 +392,28 @@ \| mmix-* \ \| mt-* \ \| msp430-* \ + \| nds32-* \| nds32le-* \| nds32be-* \ \| nios-* \| nios2-* \ \| none-* \| np1-* \| ns16k-* \| ns32k-* \ + \| open8-* \ \| orion-* \ \| pdp10-* \| pdp11-* \| pj-* \| pjl-* \| pn-* \| power-* \ - \| powerpc-* \| powerpc64-* \| powerpc64le-* \| powerpcle-* \| ppcbe-* \ + \| powerpc-* \| powerpc64-* \| powerpc64le-* \| powerpcle-* \ \| pyramid-* \ - \| romp-* \| rs6000-* \ + \| romp-* \| rs6000-* \| rx-* \ \| 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-* \ + \| sparcv8-* \| sparcv9-* \| sparcv9b-* \| sparcv9v-* \| sv1-* \| sx?-* \ + \| tahoe-* \ + \| tic30-* \| tic4x-* \| tic54x-* \| tic55x-* \| tic6x-* \| tic80-* \ + \| tile-* \| tilegx-* \ \| tron-* \ + \| ubicom32-* \ \| v850-* \| v850e-* \| vax-* \ \| we32k-* \ - \| x86-* \| x86_64-* \| xc16x-* \| xps100-* \| xscale-* \| xscalee[bl]-* \ + \| x86-* \| x86_64-* \| xc16x-* \| xps100-* \ \| xstormy16-* \| xtensa- \ \| ymp-* \ \| z8k-* \| z80-) @@ -404,7 +438,7 @@ basic_machine=a29k-amd os=-udi ;; - abacus) + abacus) basic_machine=abacus-unknown ;; adobe68k) @@ -474,11 +508,20 @@ basic_machine=powerpc-ibm os=-cnk ;; + c54x-) + basic_machine=tic54x-`echo $basic_machine \| sed 's/^[^-]-//'` + ;; + c55x-) + basic_machine=tic55x-`echo $basic_machine \| sed 's/^[^-]-//'` + ;; + c6x-) + basic_machine=tic6x-`echo $basic_machine \| sed 's/^[^-]-//'` + ;; c90) basic_machine=c90-cray os=-unicos ;; - cegcc) + cegcc) basic_machine=arm-unknown os=-cegcc ;; @@ -510,7 +553,7 @@ basic_machine=craynv-cray os=-unicosmp ;; - cr16) + cr16 \| cr16-) basic_machine=cr16-unknown os=-elf ;; @@ -726,6 +769,9 @@ basic_machine=ns32k-utek os=-sysv ;; + microblaze) + basic_machine=microblaze-xilinx + ;; mingw32) basic_machine=i386-pc os=-mingw32 @@ -830,6 +876,12 @@ np1) basic_machine=np1-gould ;; + neo-tandem) + basic_machine=neo-tandem + ;; + nse-tandem) + basic_machine=nse-tandem + ;; nsr-tandem) basic_machine=nsr-tandem ;; @@ -912,9 +964,10 @@ ;; power) basic_machine=power-ibm ;; - ppc) basic_machine=powerpc-unknown + ppc \| ppcbe) basic_machine=powerpc-unknown ;; - ppc-) basic_machine=powerpc-`echo $basic_machine \| sed 's/^[^-]-//'` + ppc-* \| ppcbe-) + basic_machine=powerpc-`echo $basic_machine \| sed 's/^[^-]-//'` ;; ppcle \| powerpclittle \| ppc-le \| powerpc-little) basic_machine=powerpcle-unknown @@ -1008,6 +1061,9 @@ basic_machine=i860-stratus os=-sysv4 ;; + strongarm-* \| thumb-) + basic_machine=arm-`echo $basic_machine \| sed 's/^[^-]-//'` + ;; sun2) basic_machine=m68000-sun ;; @@ -1064,17 +1120,10 @@ basic_machine=t90-cray os=-unicos ;; - tic54x \| c54x) - basic_machine=tic54x-unknown - os=-coff - ;; - tic55x \| c55x) - basic_machine=tic55x-unknown - os=-coff - ;; - tic6x \| c6x) - 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 @@ -1147,6 +1196,9 @@ xps \| xps100) basic_machine=xps100-honeywell ;; + xscale-* \| xscalee[bl]-) + basic_machine=`echo $basic_machine \| sed 's/^xscale/arm/'` + ;; ymp) basic_machine=ymp-cray os=-unicos @@ -1244,9 +1296,12 @@ if [ x"$os" != x"" ] then case $os in - # First match some system type aliases - # that might get confused with valid system types. + # 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\|'` ;; @@ -1268,8 +1323,8 @@ # -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* \| -solaris* \| -sym* \ - \| -kopensolaris* \ + \| -hpux* \| -unos* \| -osf* \| -luna* \| -dgux* \| -auroraux* \| -solaris* \ + \| -sym* \| -kopensolaris* \ \| -amigaos* \| -amigados* \| -msdos* \| -newsos* \| -unicos* \| -aof* \ \| -aos* \| -aros* \ \| -nindy* \| -vxsim* \| -vxworks* \| -ebmon* \| -hms* \| -mvs* \ @@ -1282,7 +1337,8 @@ \| -udi* \| -eabi* \| -lites* \| -ieee* \| -go32* \| -aux* \ \| -chorusos* \| -chorusrdb* \| -cegcc* \ \| -cygwin* \| -pe* \| -psos* \| -moss* \| -proelf* \| -rtems* \ - \| -mingw32* \| -linux-gnu* \| -linux-newlib* \| -linux-uclibc* \ + \| -mingw32* \| -linux-gnu* \| -linux-android* \ + \| -linux-newlib* \| -linux-uclibc* \ \| -uxpv* \| -beos* \| -mpeix* \| -udk* \ \| -interix* \| -uwin* \| -mks* \| -rhapsody* \| -darwin* \| -opened* \ \| -openstep* \| -oskit* \| -conix* \| -pw32* \| -nonstopux* \ @@ -1290,7 +1346,7 @@ \| -os2* \| -vos* \| -palmos* \| -uclinux* \| -nucleus* \ \| -morphos* \| -superux* \| -rtmk* \| -rtmk-nova* \| -windiss* \ \| -powermax* \| -dnix* \| -nx6 \| -nx7 \| -sei* \| -dragonfly* \ - \| -skyos* \| -haiku* \| -rdos* \| -toppers* \| -drops) + \| -skyos \| -haiku* \| -rdos* \| -toppers* \| -drops* \| -es) # Remember, each alternative MUST END IN , to match a version number. ;; -qnx) @@ -1329,7 +1385,7 @@ -opened) os=-openedition ;; - -os400) + -os400) os=-os400 ;; -wince) @@ -1378,7 +1434,7 @@ -sinix) os=-sysv4 ;; - -tpf) + -tpf) os=-tpf ;; -triton) @@ -1423,6 +1479,8 @@ -dicos) os=-dicos ;; + -nacl) + ;; -none) ;; ) @@ -1445,10 +1503,10 @@ # system, and we'll never get to this point. case $basic_machine in - score-) + score-) os=-elf ;; - spu-) + spu-) os=-elf ;; -acorn) @@ -1460,8 +1518,17 @@ arm-semi) os=-aout ;; - c4x-* \| tic4x-) - os=-coff + c4x- \| tic4x-) + os=-coff + ;; + tic54x-) + os=-coff + ;; + tic55x-) + os=-coff + ;; + tic6x-) + os=-coff ;; # This must come before the -dec entry. pdp10-) @@ -1488,7 +1555,7 @@ m68-cisco) os=-aout ;; - mep-) + mep-) os=-elf ;; mips-cisco) @@ -1515,7 +1582,7 @@ -ibm) os=-aix ;; - -knuth) + -knuth) os=-mmixware ;; -wec)
[-] [+]	Changed	radvd-1.8.5.tar.bz2/configure ^
@@ -1,12 +1,11 @@ #! /bin/sh -# From configure.in . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65. +# Generated by GNU Autoconf 2.68. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software +# Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -90,6 +89,7 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. +as_myself= case $0 in #(( [\\/] ) as_myself=$0 ;; ) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -215,11 +215,18 @@ # We cannot yet assume a decent shell, so we have to provide a # neutralization value for shells without unset; and this also # works around shells that cannot unset nonexistent variables. + # Preserve -v and -x to the replacement shell. BASH_ENV=/dev/null ENV=/dev/null (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} + case $- in # (((( + vx \| xv* ) as_opts=-vx ;; + v ) as_opts=-v ;; + x ) as_opts=-x ;; + * ) as_opts= ;; + esac + exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} fi if test x$as_have_required = xno; then : @@ -317,7 +324,7 @@ test -d "$as_dir" && break done test -z "$as_dirs" \|\| eval "mkdir $as_dirs" - } \|\| test -d "$as_dir" \|\| as_fn_error "cannot create directory $as_dir" + } \|\| test -d "$as_dir" \|\| as_fn_error $? "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -357,19 +364,19 @@ fi # as_fn_arith -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with status $?, using 1 if that was 0. +# script with STATUS, using 1 if that was 0. as_fn_error () { - as_status=$?; test $as_status -eq 0 && as_status=1 - if test "$3"; then - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $1" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -531,7 +538,7 @@ exec 6>&1 # Name of the host. -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname \|\| uname -n) 2>/dev/null \| sed 1q` @@ -788,8 +795,9 @@ fi case $ac_option in - =) ac_optarg=`expr "X$ac_option" : '[^=]=$.$'` ;; - ) ac_optarg=yes ;; + =?) ac_optarg=`expr "X$ac_option" : '[^=]=$.$'` ;; + =) ac_optarg= ;; + ) ac_optarg=yes ;; esac # Accept the important Cygnus configure options, so we can diagnose typos. @@ -834,7 +842,7 @@ ac_useropt=`expr "x$ac_option" : 'x-disable-$.$'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" \| sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -860,7 +868,7 @@ ac_useropt=`expr "x$ac_option" : 'x-enable-$[^=]$'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" \| sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1064,7 +1072,7 @@ ac_useropt=`expr "x$ac_option" : 'x-with-$[^=]$'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" \| sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1080,7 +1088,7 @@ ac_useropt=`expr "x$ac_option" : 'x-without-$.$'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" \| sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1110,8 +1118,8 @@ \| --x-librar= \| --x-libra=* \| --x-libr=* \| --x-lib=* \| --x-li=* \| --x-l=) x_libraries=$ac_optarg ;; - -) as_fn_error "unrecognized option: \`$ac_option' -Try \`$0 --help' for more information." + -) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" ;; =) @@ -1119,7 +1127,7 @@ # Reject names that are not valid shell variable names. case $ac_envvar in #( '' \| [0-9] \| [!_$as_cr_alnum] ) - as_fn_error "invalid variable name: \`$ac_envvar'" ;; + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1129,7 +1137,7 @@ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".[^-._$as_cr_alnum]" >/dev/null && $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; esac @@ -1137,13 +1145,13 @@ if test -n "$ac_prev"; then ac_option=--`echo $ac_prev \| sed 's/_/-/g'` - as_fn_error "missing argument to $ac_option" + as_fn_error $? "missing argument to $ac_option" fi if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; - fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; ) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1166,7 +1174,7 @@ [\\/$]* \| ?:[\\/]* ) continue;; NONE \| '' ) case $ac_var in prefix ) continue;; esac;; esac - as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" done # There might be people who depend on the old broken behavior: `$host' @@ -1180,8 +1188,8 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 + $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1196,9 +1204,9 @@ ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` \|\| - as_fn_error "working directory cannot be determined" + as_fn_error $? "working directory cannot be determined" test "X$ac_ls_di" = "X$ac_pwd_ls_di" \|\| - as_fn_error "pwd does not report name of working directory" + as_fn_error $? "pwd does not report name of working directory" # Find the source files, if location was not specified. @@ -1237,11 +1245,11 @@ fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" \|\| as_fn_error "$ac_msg" + cd "$srcdir" && test -r "./$ac_unique_file" \|\| as_fn_error $? "$ac_msg" pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then @@ -1281,7 +1289,7 @@ --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking...' messages + -q, --quiet, --silent do not print \`checking ...' messages --cache-file=FILE cache test results in FILE [disabled] -C, --config-cache alias for \`--cache-file=config.cache' -n, --no-create do not create output files @@ -1365,8 +1373,9 @@ LIBS libraries to pass to the linker, e.g. -l<library> CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if you have headers in a nonstandard directory <include dir> - YACC The `Yet Another C Compiler' implementation to use. Defaults to - the first program found out of: `bison -y', `byacc', `yacc'. + YACC The `Yet Another Compiler Compiler' implementation to use. + Defaults to the first program found out of: `bison -y', `byacc', + `yacc'. YFLAGS The list of arguments that will be passed by default to $YACC. This script will default YFLAGS to the empty string to avoid a default value of `-d' given by some make applications. @@ -1439,9 +1448,9 @@ if $ac_init_version; then cat <<\_ACEOF configure -generated by GNU Autoconf 2.65 +generated by GNU Autoconf 2.68 -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1485,7 +1494,7 @@ ac_retval=1 fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_compile @@ -1531,7 +1540,7 @@ # interfere with the next link command; also delete a directory that is # left behind by Apple's compiler. We do this before executing the actions. rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_link @@ -1557,7 +1566,7 @@ mv -f conftest.er1 conftest.err fi $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } >/dev/null && { + test $ac_status = 0; } > conftest.i && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" \|\| test ! -s conftest.err }; then : @@ -1568,7 +1577,7 @@ ac_retval=1 fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_cpp @@ -1610,7 +1619,7 @@ ac_retval=$ac_status fi rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_run @@ -1623,10 +1632,10 @@ ac_fn_c_check_header_mongrel () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + if eval \${$3+:} false; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 fi eval ac_res=\$$3 @@ -1662,7 +1671,7 @@ else ac_header_preproc=no fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 $as_echo "$ac_header_preproc" >&6; } @@ -1689,7 +1698,7 @@ esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else eval "$3=\$ac_header_compiler" @@ -1698,7 +1707,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_mongrel @@ -1711,7 +1720,7 @@ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1729,7 +1738,7 @@ eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_compile @@ -1741,7 +1750,7 @@ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1796,7 +1805,7 @@ eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_func cat >config.log <<_ACEOF @@ -1804,7 +1813,7 @@ running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.65. Invocation command line was +generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -1914,11 +1923,9 @@ { echo - cat <<\_ASBOX -## ---------------- ## + $as_echo "## ---------------- ## ## Cache variables. ## -## ---------------- ## -_ASBOX +## ---------------- ##" echo # The following way of writing the cache mishandles newlines in values, ( @@ -1952,11 +1959,9 @@ ) echo - cat <<\_ASBOX -## ----------------- ## + $as_echo "## ----------------- ## ## Output variables. ## -## ----------------- ## -_ASBOX +## ----------------- ##" echo for ac_var in $ac_subst_vars do @@ -1969,11 +1974,9 @@ echo if test -n "$ac_subst_files"; then - cat <<\_ASBOX -## ------------------- ## + $as_echo "## ------------------- ## ## File substitutions. ## -## ------------------- ## -_ASBOX +## ------------------- ##" echo for ac_var in $ac_subst_files do @@ -1987,11 +1990,9 @@ fi if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## + $as_echo "## ----------- ## ## confdefs.h. ## -## ----------- ## -_ASBOX +## ----------- ##" echo cat confdefs.h echo @@ -2046,7 +2047,12 @@ ac_site_file1=NONE ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - ac_site_file1=$CONFIG_SITE + # We do not want a PATH search for config.site. + case $CONFIG_SITE in #(( + -) ac_site_file1=./$CONFIG_SITE;; + /) ac_site_file1=$CONFIG_SITE;; + ) ac_site_file1=./$CONFIG_SITE;; + esac elif test "x$prefix" != xNONE; then ac_site_file1=$prefix/share/config.site ac_site_file2=$prefix/etc/config.site @@ -2061,7 +2067,11 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 $as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/\| /' "$ac_site_file" >&5 - . "$ac_site_file" + . "$ac_site_file" \ + \|\| { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "failed to load site script $ac_site_file +See \`config.log' for more details" "$LINENO" 5; } fi done @@ -2137,7 +2147,7 @@ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi ## -------------------- ## ## Main body of script. ## @@ -2153,16 +2163,22 @@ ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - for ac_t in install-sh install.sh shtool; do - if test -f "$ac_dir/$ac_t"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/$ac_t -c" - break 2 - fi - done + if test -f "$ac_dir/install-sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f "$ac_dir/install.sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + elif test -f "$ac_dir/shtool"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break + fi done if test -z "$ac_aux_dir"; then - as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 + as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -2176,27 +2192,27 @@ # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 \|\| - as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 $as_echo_n "checking build system type... " >&6; } -if test "${ac_cv_build+set}" = set; then : +if ${ac_cv_build+:} false; then : $as_echo_n "(cached) " >&6 else ac_build_alias=$build_alias test "x$ac_build_alias" = x && ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` test "x$ac_build_alias" = x && - as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` \|\| - as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 $as_echo "$ac_cv_build" >&6; } case $ac_cv_build in --) ;; -) as_fn_error "invalid value of canonical build" "$LINENO" 5;; +) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' @@ -2214,14 +2230,14 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 $as_echo_n "checking host system type... " >&6; } -if test "${ac_cv_host+set}" = set; then : +if ${ac_cv_host+:} false; then : $as_echo_n "(cached) " >&6 else if test "x$host_alias" = x; then ac_cv_host=$ac_cv_build else ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` \|\| - as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 fi fi @@ -2229,7 +2245,7 @@ $as_echo "$ac_cv_host" >&6; } case $ac_cv_host in --) ;; -) as_fn_error "invalid value of canonical host" "$LINENO" 5;; +) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' @@ -2247,14 +2263,14 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5 $as_echo_n "checking target system type... " >&6; } -if test "${ac_cv_target+set}" = set; then : +if ${ac_cv_target+:} false; then : $as_echo_n "(cached) " >&6 else if test "x$target_alias" = x; then ac_cv_target=$ac_cv_host else ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` \|\| - as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5 + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5 fi fi @@ -2262,7 +2278,7 @@ $as_echo "$ac_cv_target" >&6; } case $ac_cv_target in --) ;; -) as_fn_error "invalid value of canonical target" "$LINENO" 5;; +) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;; esac target=$ac_cv_target ac_save_IFS=$IFS; IFS='-' @@ -2305,7 +2321,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 $as_echo_n "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then : +if ${ac_cv_path_install+:} false; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2392,11 +2408,11 @@ ' case `pwd` in [\\\"\#\$\&\'\`$am_lf]) - as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; esac case $srcdir in [\\\"\#\$\&\'\`$am_lf\ \ ]) - as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; esac # Do `set' in a subshell so we don't clobber the current shell's @@ -2418,7 +2434,7 @@ # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". - as_fn_error "ls -t appears to fail. Make sure there is not a broken + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken alias in your environment" "$LINENO" 5 fi @@ -2428,7 +2444,7 @@ # Ok. : else - as_fn_error "newly created file is older than distributed files! + as_fn_error $? "newly created file is older than distributed files! Check your system clock" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -2482,7 +2498,7 @@ set dummy ${ac_tool_prefix}strip; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then : +if ${ac_cv_prog_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then @@ -2522,7 +2538,7 @@ set dummy strip; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then @@ -2575,7 +2591,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } if test -z "$MKDIR_P"; then - if test "${ac_cv_path_mkdir+set}" = set; then : + if ${ac_cv_path_mkdir+:} false; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2626,7 +2642,7 @@ set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_AWK+set}" = set; then : +if ${ac_cv_prog_AWK+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$AWK"; then @@ -2666,7 +2682,7 @@ $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" \| sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -2674,7 +2690,7 @@ all: @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. case `${MAKE-make} -f conftest.make 2>/dev/null` in @@@%%%=?=@@@%%%) eval ac_cv_prog_make_${ac_make}_set=yes;; @@ -2708,7 +2724,7 @@ am__isrc=' -I$(srcdir)' # test to see if srcdir already configured if test -f $srcdir/config.status; then - as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 + as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 fi fi @@ -2792,7 +2808,7 @@ ) { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown: $target" >&5 $as_echo "unknown: $target" >&6; } - as_fn_error "currently only Linux and BSD 4.4 with NRL's IPv6 code are + as_fn_error $? "currently only Linux and BSD 4.4 with NRL's IPv6 code are supported. If you have such a system and it is not guessed correctly you must specifiy it with --target on the configure command line" "$LINENO" 5 ;; @@ -2808,7 +2824,7 @@ set dummy ${ac_tool_prefix}gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2848,7 +2864,7 @@ set dummy gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -2901,7 +2917,7 @@ set dummy ${ac_tool_prefix}cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2941,7 +2957,7 @@ set dummy cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3000,7 +3016,7 @@ set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3044,7 +3060,7 @@ set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -3098,8 +3114,8 @@ test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "no acceptable C compiler found in \$PATH -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -3213,9 +3229,8 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ as_fn_set_status 77 -as_fn_error "C compiler cannot create executables -See \`config.log' for more details." "$LINENO" 5; }; } +as_fn_error 77 "C compiler cannot create executables +See \`config.log' for more details" "$LINENO" 5; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -3257,8 +3272,8 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -3315,9 +3330,9 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot run C compiled programs. +as_fn_error $? "cannot run C compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5; } fi fi fi @@ -3328,7 +3343,7 @@ ac_clean_files=$ac_clean_files_save { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 $as_echo_n "checking for suffix of object files... " >&6; } -if test "${ac_cv_objext+set}" = set; then : +if ${ac_cv_objext+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -3368,8 +3383,8 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot compute suffix of object files: cannot compile -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "cannot compute suffix of object files: cannot compile +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi @@ -3379,7 +3394,7 @@ ac_objext=$OBJEXT { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then : +if ${ac_cv_c_compiler_gnu+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -3416,7 +3431,7 @@ ac_save_CFLAGS=$CFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then : +if ${ac_cv_prog_cc_g+:} false; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag @@ -3494,7 +3509,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then : +if ${ac_cv_prog_cc_c89+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no @@ -3655,7 +3670,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 $as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : +if ${am_cv_CC_dependencies_compiler_type+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then @@ -3834,7 +3849,7 @@ set dummy rm; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_RM+set}" = set; then : +if ${ac_cv_path_RM+:} false; then : $as_echo_n "(cached) " >&6 else case $RM in @@ -3872,13 +3887,13 @@ if test "x$RM" = xNOTFOUND; then - as_fn_error "can't find rm in your path - check PATH" "$LINENO" 5 + as_fn_error $? "can't find rm in your path - check PATH" "$LINENO" 5 fi # Extract the first word of "sed", so it can be a program name with args. set dummy sed; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_SED+set}" = set; then : +if ${ac_cv_path_SED+:} false; then : $as_echo_n "(cached) " >&6 else case $SED in @@ -3916,13 +3931,13 @@ if test "x$SED" = xNOTFOUND; then - as_fn_error "can't find sed in your path - check PATH" "$LINENO" 5 + as_fn_error $? "can't find sed in your path - check PATH" "$LINENO" 5 fi # Extract the first word of "ln", so it can be a program name with args. set dummy ln; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_LN+set}" = set; then : +if ${ac_cv_path_LN+:} false; then : $as_echo_n "(cached) " >&6 else case $LN in @@ -3964,7 +3979,7 @@ set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_YACC+set}" = set; then : +if ${ac_cv_prog_YACC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$YACC"; then @@ -4007,7 +4022,7 @@ set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_LEX+set}" = set; then : +if ${ac_cv_prog_LEX+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$LEX"; then @@ -4077,7 +4092,7 @@ test $ac_status = 0; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking lex output file root" >&5 $as_echo_n "checking lex output file root... " >&6; } -if test "${ac_cv_prog_lex_root+set}" = set; then : +if ${ac_cv_prog_lex_root+:} false; then : $as_echo_n "(cached) " >&6 else @@ -4086,7 +4101,7 @@ elif test -f lexyy.c; then ac_cv_prog_lex_root=lexyy else - as_fn_error "cannot find output from $LEX; giving up" "$LINENO" 5 + as_fn_error $? "cannot find output from $LEX; giving up" "$LINENO" 5 fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_root" >&5 @@ -4096,7 +4111,7 @@ if test -z "${LEXLIB+set}"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking lex library" >&5 $as_echo_n "checking lex library... " >&6; } -if test "${ac_cv_lib_lex+set}" = set; then : +if ${ac_cv_lib_lex+:} false; then : $as_echo_n "(cached) " >&6 else @@ -4126,7 +4141,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether yytext is a pointer" >&5 $as_echo_n "checking whether yytext is a pointer... " >&6; } -if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then : +if ${ac_cv_prog_lex_yytext_pointer+:} false; then : $as_echo_n "(cached) " >&6 else # POSIX says lex can declare yytext either as a pointer or an array; the @@ -4137,7 +4152,8 @@ LIBS="$LEXLIB $ac_save_LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. / -#define YYTEXT_POINTER 1 + + #define YYTEXT_POINTER 1 `cat $LEX_OUTPUT_ROOT.c` _ACEOF if ac_fn_c_try_link "$LINENO"; then : @@ -4165,7 +4181,7 @@ set dummy tar; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_TAR+set}" = set; then : +if ${ac_cv_path_TAR+:} false; then : $as_echo_n "(cached) " >&6 else case $TAR in @@ -4205,7 +4221,7 @@ set dummy gzip; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_GZIP+set}" = set; then : +if ${ac_cv_path_GZIP+:} false; then : $as_echo_n "(cached) " >&6 else case $GZIP in @@ -4298,7 +4314,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_ntop in -lc" >&5 $as_echo_n "checking for inet_ntop in -lc... " >&6; } -if test "${ac_cv_lib_c_inet_ntop+set}" = set; then : +if ${ac_cv_lib_c_inet_ntop+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -4332,7 +4348,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_inet_ntop" >&5 $as_echo "$ac_cv_lib_c_inet_ntop" >&6; } -if test "x$ac_cv_lib_c_inet_ntop" = x""yes; then : +if test "x$ac_cv_lib_c_inet_ntop" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBC 1 _ACEOF @@ -4342,7 +4358,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_ntop in -linet6" >&5 $as_echo_n "checking for inet_ntop in -linet6... " >&6; } -if test "${ac_cv_lib_inet6_inet_ntop+set}" = set; then : +if ${ac_cv_lib_inet6_inet_ntop+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -4376,11 +4392,11 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_inet6_inet_ntop" >&5 $as_echo "$ac_cv_lib_inet6_inet_ntop" >&6; } -if test "x$ac_cv_lib_inet6_inet_ntop" = x""yes; then : +if test "x$ac_cv_lib_inet6_inet_ntop" = xyes; then : LIBS="$LIBS -linet6" else - as_fn_error "can't continue without libinet6.a library - check your LDFLAGS" "$LINENO" 5 + as_fn_error $? "can't continue without libinet6.a library - check your LDFLAGS" "$LINENO" 5 fi @@ -4402,7 +4418,7 @@ CPP= fi if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then : + if ${ac_cv_prog_CPP+:} false; then : $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded @@ -4432,7 +4448,7 @@ # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -4448,11 +4464,11 @@ ac_preproc_ok=: break fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext +rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok; then : break fi @@ -4491,7 +4507,7 @@ # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -4507,18 +4523,18 @@ ac_preproc_ok=: break fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext +rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5; } fi ac_ext=c @@ -4530,7 +4546,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 $as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if test "${ac_cv_path_GREP+set}" = set; then : +if ${ac_cv_path_GREP+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$GREP"; then @@ -4579,7 +4595,7 @@ done IFS=$as_save_IFS if test -z "$ac_cv_path_GREP"; then - as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_GREP=$GREP @@ -4593,7 +4609,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 $as_echo_n "checking for egrep... " >&6; } -if test "${ac_cv_path_EGREP+set}" = set; then : +if ${ac_cv_path_EGREP+:} false; then : $as_echo_n "(cached) " >&6 else if echo a \| $GREP -E '(a\|b)' >/dev/null 2>&1 @@ -4645,7 +4661,7 @@ done IFS=$as_save_IFS if test -z "$ac_cv_path_EGREP"; then - as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_EGREP=$EGREP @@ -4660,7 +4676,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 $as_echo_n "checking for ANSI C header files... " >&6; } -if test "${ac_cv_header_stdc+set}" = set; then : +if ${ac_cv_header_stdc+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -4777,8 +4793,7 @@ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" \| $as_tr_sh` ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default " -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" \| $as_tr_cpp` 1 _ACEOF @@ -4804,8 +4819,7 @@ do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" \| $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" \| $as_tr_cpp` 1 _ACEOF @@ -4816,7 +4830,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5 $as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; } -if test "${ac_cv_header_time+set}" = set; then : +if ${ac_cv_header_time+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -4852,7 +4866,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 $as_echo_n "checking for an ANSI C-conforming const... " >&6; } -if test "${ac_cv_c_const+set}" = set; then : +if ${ac_cv_c_const+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -4985,7 +4999,7 @@ for ac_func in getopt_long do : ac_fn_c_check_func "$LINENO" "getopt_long" "ac_cv_func_getopt_long" -if test "x$ac_cv_func_getopt_long" = x""yes; then : +if test "x$ac_cv_func_getopt_long" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_GETOPT_LONG 1 _ACEOF @@ -4994,7 +5008,13 @@ done -CONDITIONAL_SOURCES="device-${arch}.${OBJEXT} privsep-${arch}.${OBJEXT} ${CONDITIONAL_SOURCES}" +CONDITIONAL_SOURCES="device-${arch}.${OBJEXT} ${CONDITIONAL_SOURCES}" +if test x${arch} == xlinux ; then + CONDITIONAL_SOURCES="privsep-${arch}.${OBJEXT} ${CONDITIONAL_SOURCES}" + +$as_echo "#define USE_PRIVSEP 1" >>confdefs.h + +fi @@ -5071,10 +5091,21 @@ :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then - test "x$cache_file" != "x/dev/null" && + if test "x$cache_file" != "x/dev/null"; then { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 $as_echo "$as_me: updating cache $cache_file" >&6;} - cat confcache >$cache_file + if test ! -f "$cache_file" \|\| test -h "$cache_file"; then + cat confcache >"$cache_file" + else + case $cache_file in #( + /* \| ?:) + mv -f confcache "$cache_file"$$ && + mv -f "$cache_file"$$ "$cache_file" ;; #( + ) + mv -f confcache "$cache_file" ;; + esac + fi + fi else { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} @@ -5090,6 +5121,7 @@ ac_libobjs= ac_ltlibobjs= +U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' @@ -5113,15 +5145,15 @@ fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - as_fn_error "conditional \"AMDEP\" was never defined. + as_fn_error $? "conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - as_fn_error "conditional \"am__fastdepCC\" was never defined. + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -: ${CONFIG_STATUS=./config.status} +: "${CONFIG_STATUS=./config.status}" ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" @@ -5222,6 +5254,7 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. +as_myself= case $0 in #(( [\\/] ) as_myself=$0 ;; ) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -5267,19 +5300,19 @@ (unset CDPATH) >/dev/null 2>&1 && unset CDPATH -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with status $?, using 1 if that was 0. +# script with STATUS, using 1 if that was 0. as_fn_error () { - as_status=$?; test $as_status -eq 0 && as_status=1 - if test "$3"; then - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $1" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -5475,7 +5508,7 @@ test -d "$as_dir" && break done test -z "$as_dirs" \|\| eval "mkdir $as_dirs" - } \|\| test -d "$as_dir" \|\| as_fn_error "cannot create directory $as_dir" + } \|\| test -d "$as_dir" \|\| as_fn_error $? "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -5529,7 +5562,7 @@ # values after options handling. ac_log=" This file was extended by $as_me, which was -generated by GNU Autoconf 2.65. Invocation command line was +generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -5595,10 +5628,10 @@ ac_cs_config="`$as_echo "$ac_configure_args" \| sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.65, +configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -5616,11 +5649,16 @@ while test $# != 0 do case $1 in - --=) + --=?) ac_option=`expr "X$1" : 'X$[^=]$='` ac_optarg=`expr "X$1" : 'X[^=]=$.$'` ac_shift=: ;; + --=) + ac_option=`expr "X$1" : 'X$[^=]$='` + ac_optarg= + ac_shift=: + ;; ) ac_option=$1 ac_optarg=$2 @@ -5642,6 +5680,7 @@ $ac_shift case $ac_optarg in \') ac_optarg=`$as_echo "$ac_optarg" \| sed "s/'/'\\\\\\\\''/g"` ;; + '') as_fn_error $? "missing file argument" ;; esac as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; @@ -5654,7 +5693,7 @@ ac_need_defaults=false;; --he \| --h) # Conflict between --help and --header - as_fn_error "ambiguous option: \`$1' + as_fn_error $? "ambiguous option: \`$1' Try \`$0 --help' for more information.";; --help \| --hel \| -h ) $as_echo "$ac_cs_usage"; exit ;; @@ -5663,7 +5702,7 @@ ac_cs_silent=: ;; # This is an error. - -) as_fn_error "unrecognized option: \`$1' + -) as_fn_error $? "unrecognized option: \`$1' Try \`$0 --help' for more information." ;; ) as_fn_append ac_config_targets " $1" @@ -5721,7 +5760,7 @@ "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - ) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + ) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -5744,9 +5783,10 @@ # after its creation but before its name has been assigned to `$tmp'. $debug \|\| { - tmp= + tmp= ac_tmp= trap 'exit_status=$? - { test -z "$tmp" \|\| test ! -d "$tmp" \|\| rm -fr "$tmp"; } && exit $exit_status + : "${ac_tmp:=$tmp}" + { test ! -d "$ac_tmp" \|\| rm -fr "$ac_tmp"; } && exit $exit_status ' 0 trap 'as_fn_exit 1' 1 2 13 15 } @@ -5754,12 +5794,13 @@ { tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" + test -d "$tmp" } \|\| { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} \|\| as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 +} \|\| as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 +ac_tmp=$tmp # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -5776,12 +5817,12 @@ fi ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then - ac_cs_awk_cr='\r' + ac_cs_awk_cr='\\r' else ac_cs_awk_cr=$ac_cr fi -echo 'BEGIN {' >"$tmp/subs1.awk" && +echo 'BEGIN {' >"$ac_tmp/subs1.awk" && _ACEOF @@ -5790,18 +5831,18 @@ echo "$ac_subst_vars" \| sed 's/./&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh \|\| - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 -ac_delim_num=`echo "$ac_subst_vars" \| grep -c '$'` + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" \| grep -c '^'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do . ./conf$$subs.sh \|\| - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 ac_delim_n=`sed -n "s/.$ac_delim\$/X/p" conf$$subs.awk \| grep -c X` if test $ac_delim_n = $ac_delim_num; then break elif $ac_last_try; then - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -5809,7 +5850,7 @@ rm -f conf$$subs.sh cat >>$CONFIG_STATUS <<_ACEOF \|\| ac_write_fail=1 -cat >>"\$tmp/subs1.awk" <<\\_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && _ACEOF sed -n ' h @@ -5857,7 +5898,7 @@ rm -f conf$$subs.awk cat >>$CONFIG_STATUS <<_ACEOF \|\| ac_write_fail=1 _ACAWK -cat >>"\$tmp/subs1.awk" <<_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && for (key in S) S_is_set[key] = 1 FS = "" @@ -5889,21 +5930,29 @@ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" else cat -fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ - \|\| as_fn_error "could not setup config files machinery" "$LINENO" 5 +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ + \|\| as_fn_error $? "could not setup config files machinery" "$LINENO" 5 _ACEOF -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and # trailing colons and then remove the whole line if VPATH becomes empty # (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]VPATH[ ]=/{ -s/:\$(srcdir):/:/ -s/:\${srcdir}:/:/ -s/:@srcdir@:/:/ -s/^$[^=]=[ ]$:/\1/ + ac_vpsub='/^[ ]VPATH[ ]=[ ]/{ +h +s/// +s/^/:/ +s/[ ]$/:/ +s/:\$(srcdir):/:/g +s/:\${srcdir}:/:/g +s/:@srcdir@:/:/g +s/^:// s/:$// +x +s/$=[ ]$./\1/ +G +s/\n// s/^[^=]=[ ]$// }' fi @@ -5915,7 +5964,7 @@ # No need to generate them if there are no CONFIG_HEADERS. # This happens for instance with `./config.status Makefile'. if test -n "$CONFIG_HEADERS"; then -cat >"$tmp/defines.awk" <<\_ACAWK \|\| +cat >"$ac_tmp/defines.awk" <<\_ACAWK \|\| BEGIN { _ACEOF @@ -5927,11 +5976,11 @@ # handling of long lines. ac_delim='%!_!# ' for ac_last_try in false false :; do - ac_t=`sed -n "/$ac_delim/p" confdefs.h` - if test -z "$ac_t"; then + ac_tt=`sed -n "/$ac_delim/p" confdefs.h` + if test -z "$ac_tt"; then break elif $ac_last_try; then - as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -6016,7 +6065,7 @@ _ACAWK _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF \|\| ac_write_fail=1 - as_fn_error "could not setup config headers machinery" "$LINENO" 5 + as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 fi # test -n "$CONFIG_HEADERS" @@ -6029,7 +6078,7 @@ esac case $ac_mode$ac_tag in :[FHL]:);; - :L \| :C:) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; + :L* \| :C:) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -6048,7 +6097,7 @@ for ac_f do case $ac_f in - -) ac_f="$tmp/stdin";; + -) ac_f="$ac_tmp/stdin";; ) # Look for the file first in the build tree, then in the source tree # (if the path is not absolute). The absolute path cannot be DOS-style, # because $ac_f cannot contain `:'. @@ -6057,7 +6106,7 @@ [\\/$]) false;; ) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac \|\| - as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in \') ac_f=`$as_echo "$ac_f" \| sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -6083,8 +6132,8 @@ esac case $ac_tag in - :-: \| :-) cat >"$tmp/stdin" \ - \|\| as_fn_error "could not create $ac_file" "$LINENO" 5 ;; + :-:* \| :-) cat >"$ac_tmp/stdin" \ + \|\| as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -6220,23 +6269,24 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t $ac_datarootdir_hack " -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" \| $AWK -f "$tmp/subs.awk" >$tmp/out \ - \|\| as_fn_error "could not create $ac_file" "$LINENO" 5 +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" \| $AWK -f "$ac_tmp/subs.awk" \ + >$ac_tmp/out \|\| as_fn_error $? "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]datarootdir[ ]:=/p' "$tmp/out"`; test -z "$ac_out"; } && + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]datarootdir[ ]:=/p' \ + "$ac_tmp/out"`; test -z "$ac_out"; } && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&5 +which seems to be undefined. Please make sure it is defined" >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&2;} +which seems to be undefined. Please make sure it is defined" >&2;} - rm -f "$tmp/stdin" + rm -f "$ac_tmp/stdin" case $ac_file in - -) cat "$tmp/out" && rm -f "$tmp/out";; - ) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; + ) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; esac \ - \|\| as_fn_error "could not create $ac_file" "$LINENO" 5 + \|\| as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; :H) # @@ -6245,21 +6295,21 @@ if test x"$ac_file" != x-; then { $as_echo "/ $configure_input /" \ - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" - } >"$tmp/config.h" \ - \|\| as_fn_error "could not create $ac_file" "$LINENO" 5 - if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" + } >"$ac_tmp/config.h" \ + \|\| as_fn_error $? "could not create $ac_file" "$LINENO" 5 + if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 $as_echo "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" - mv "$tmp/config.h" "$ac_file" \ - \|\| as_fn_error "could not create $ac_file" "$LINENO" 5 + mv "$ac_tmp/config.h" "$ac_file" \ + \|\| as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else $as_echo "/ $configure_input */" \ - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ - \|\| as_fn_error "could not create -" "$LINENO" 5 + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ + \|\| as_fn_error $? "could not create -" "$LINENO" 5 fi # Compute "$ac_file"'s index in $config_headers. _am_arg="$ac_file" @@ -6409,7 +6459,7 @@ ac_clean_files=$ac_clean_files_save test $ac_write_fail = 0 \|\| - as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 # configure is writing to config.log, and then calls config.status. @@ -6430,7 +6480,7 @@ exec 5>>config.log # Use \|\|, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. - $ac_cs_success \|\| as_fn_exit $? + $ac_cs_success \|\| as_fn_exit 1 fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
[-] [+]	Added	radvd-1.8.5.tar.bz2/configure.ac ^
@@ -0,0 +1,207 @@ +dnl +dnl +dnl Authors: +dnl Lars Fenneberg <lf@elemental.net> +dnl +dnl This software is Copyright 1996-2000 by the above mentioned author(s), +dnl All Rights Reserved. +dnl +dnl The license which is distributed with this software in the file COPYRIGHT +dnl applies to this software. If your distribution is missing this file, you +dnl may request it from <pekkas@netcore.fi>. +dnl +dnl + +AC_INIT(radvd.c) + +AC_CANONICAL_SYSTEM +VERSION=`cat ${srcdir}/VERSION \| grep -v '^#' \| tr -d '\012'` +AM_INIT_AUTOMAKE(radvd,$VERSION,true) +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES(yes)]) + +AC_MSG_CHECKING([architecture]) +case "$target" in + linux) + AC_MSG_RESULT(linux) + AC_DEFINE([_GNU_SOURCE], [], [whether compiling on Linux, glibc>=2.8 doesn't expose in6_pktinfo otherwise..]) + arch=linux + ;; + bsd) + AC_MSG_RESULT(bsd44) + arch=bsd44 + ;; + darwin) + AC_MSG_RESULT([bsd44 (darwin)]) + arch=bsd44 + ;; + ) + AC_MSG_RESULT(unknown: $target) + AC_MSG_ERROR( +[currently only Linux and BSD 4.4 with NRL's IPv6 code are +supported. If you have such a system and it is not guessed correctly +you must specifiy it with --target on the configure command line]) + ;; +esac + +dnl Determine CC and preset CFLAGS +AC_PROG_CC + +dnl Determine of netlink is available +AC_MSG_CHECKING(netlink) +AC_TRY_COMPILE([ +#include <asm/types.h> +#include <sys/socket.h> +#include <linux/netlink.h> +#include <linux/rtnetlink.h> +],[ +int +main(int argc, char argv[]) +{ + int sock; + struct sockaddr_nl snl; + + sock = socket(PF_NETLINK, SOCK_RAW, NETLINK_ROUTE); + + snl.nl_family = AF_NETLINK; + snl.nl_groups = RTMGRP_LINK; + + return 0; +} +],[ +AC_DEFINE(HAVE_NETLINK, 1, [Linux netlink]) +CONDITIONAL_SOURCES=netlink.${OBJEXT} +AC_MSG_RESULT(yes) +],[ +AC_MSG_RESULT(no) +]) + +dnl Needed for normal compile +AC_PROG_INSTALL +AC_PATH_PROG(RM, rm, NOTFOUND) +if test "x$RM" = xNOTFOUND; then + AC_MSG_ERROR(can't find rm in your path - check PATH) +fi +AC_PATH_PROG(SED, sed, NOTFOUND) +if test "x$SED" = xNOTFOUND; then + AC_MSG_ERROR(can't find sed in your path - check PATH) +fi +dnl Not needed +AC_PATH_PROG(LN, ln) +AC_PROG_YACC +AM_PROG_LEX +AC_PATH_PROG(TAR, tar) +AC_PATH_PROG(GZIP, gzip) + +dnl Check where to put the logfile +AC_MSG_CHECKING(where to put logfile) +AC_ARG_WITH(logfile, +[ --with-logfile Path to the radvd logfile [/var/log/radvd.log]], + PATH_RADVD_LOG=$withval, + PATH_RADVD_LOG=/var/log/radvd.log) +AC_MSG_RESULT($PATH_RADVD_LOG) + +dnl Check where to put the pidfile +AC_MSG_CHECKING(where to put pidfile) +AC_ARG_WITH(pidfile, +[ --with-pidfile Path to the radvd pidfile [/var/run/radvd.pid]], + PATH_RADVD_PID=$withval, + PATH_RADVD_PID=/var/run/radvd.pid) +AC_MSG_RESULT($PATH_RADVD_PID) + +dnl Check where to put the configfile +AC_MSG_CHECKING(where to find configfile) +AC_ARG_WITH(configfile, +[ --with-configfile Path to the radvd config file [SYSCONF/radvd.conf]], + PATH_RADVD_CONF=$withval, + [eval PATH_RADVD_CONF=${sysconfdir}/radvd.conf]) +PATH_RADVD_CONF=$(echo $PATH_RADVD_CONF \| sed 's/NONE//1') +AC_MSG_RESULT($PATH_RADVD_CONF) + +dnl Checking which syslog facility to use +AC_MSG_CHECKING(which syslog facility to use) +AC_ARG_WITH(facility, +[ --with-facility Syslog facility to use when using syslog logging], + LOG_FACILITY=$withval, + LOG_FACILITY=LOG_DAEMON) +AC_MSG_RESULT($LOG_FACILITY) + +dnl Checks for libraries. + +AC_CHECK_LIB(c, inet_ntop,, + AC_CHECK_LIB(inet6, inet_ntop, + LIBS="$LIBS -linet6" + , + AC_MSG_ERROR(can't continue without libinet6.a library - check your LDFLAGS) + ) +) +# prevent caching +unset ac_cv_lib_inet6_inet_ntop + +dnl Checks for header files. +AC_HEADER_STDC +AC_CHECK_HEADERS( \ + getopt.h \ + ifaddrs.h \ + machine/limits.h \ + machine/param.h \ + net/if_arp.h \ + net/if_dl.h \ + net/if_types.h \ + sys/param.h \ + sys/sockio.h \ + sys/time.h \ + time.h \ +) +AC_HEADER_TIME + +dnl Checks for typedefs, structures, and compiler characteristics. +AC_C_CONST + +AC_MSG_CHECKING(whether struct sockaddr_in6 has sin6_scope_id) +AC_TRY_COMPILE([#include <sys/types.h> +#include <netinet/in.h>], [static struct sockaddr_in6 ac_sin6; int ac_size = +sizeof (ac_sin6.sin6_scope_id);], [AC_MSG_RESULT(yes); AC_DEFINE([HAVE_SIN6_SCOPE_ID], +1, [whether struct sockaddr_in6 has sin6_scope_id])], +AC_MSG_RESULT(no)) + +AC_MSG_CHECKING(whether struct in6_addr has u6_addrXX and defines s6_addrXX) +AC_TRY_COMPILE([#include <netinet/in.h>], [static struct in6_addr in6_u; +int u = in6_u.s6_addr16;], [AC_MSG_RESULT(yes); AC_DEFINE([HAVE_IN6_ADDR_S6_ADDR], +1, [whether struct in6_addr has u6_addrXX and defines s6_addrXX])], +AC_MSG_RESULT(no)) + +dnl Checks for library functions. +AC_CHECK_FUNCS(getopt_long) + +CONDITIONAL_SOURCES="device-${arch}.${OBJEXT} ${CONDITIONAL_SOURCES}" +if test x${arch} == xlinux ; then + CONDITIONAL_SOURCES="privsep-${arch}.${OBJEXT} ${CONDITIONAL_SOURCES}" + AC_DEFINE(USE_PRIVSEP, 1, [Use privsep]) +fi +AC_SUBST(CONDITIONAL_SOURCES) + +AC_SUBST(VERSION) +AC_SUBST(PATH_RADVD_CONF) +AC_SUBST(PATH_RADVD_PID) +AC_SUBST(PATH_RADVD_LOG) +AC_SUBST(LOG_FACILITY) + +AM_CONFIG_HEADER(config.h) +AC_OUTPUT(Makefile) + +cat << EOF + +Your build configuration: + + CFLAGS = $CFLAGS + LDFLAGS = $LDFLAGS + Arch = ${arch} + Extras: ${CONDITIONAL_SOURCES} + prefix: $prefix + PID file: $PATH_RADVD_PID + Log file: $PATH_RADVD_LOG + Config file: $PATH_RADVD_CONF + Radvd version: $VERSION + +EOF +
[-] [+]	Changed	radvd-1.8.5.tar.bz2/copyright.blurb ^
@@ -1,5 +1,4 @@ /* - * $Id: copyright.blurb,v 1.3 2005/10/18 19:17:29 lutchann Exp $ * * Authors: * Lars Fenneberg <lf@elemental.net>
[-] [+]	Changed	radvd-1.8.5.tar.bz2/defaults.h ^
@@ -1,5 +1,4 @@ /* - * $Id: defaults.h,v 1.31 2011/05/04 18:03:57 reubenhwk Exp $ * * Authors: * Lars Fenneberg <lf@elemental.net>
[-] [+]	Changed	radvd-1.8.5.tar.bz2/device-bsd44.c ^
@@ -1,5 +1,4 @@ /* - * $Id: device-bsd44.c,v 1.29 2011/02/06 03:41:38 reubenhwk Exp $ * * Authors: * Craig Metz <cmetz@inner.net>
[-] [+]	Changed	radvd-1.8.5.tar.bz2/device-common.c ^
@@ -1,5 +1,4 @@ /* - * $Id: device-common.c,v 1.12 2011/02/06 03:41:38 reubenhwk Exp $ * * Authors: * Lars Fenneberg <lf@elemental.net>
[-] [+]	Changed	radvd-1.8.5.tar.bz2/device-linux.c ^
@@ -1,5 +1,4 @@ /* - * $Id: device-linux.c,v 1.28 2011/02/06 03:41:38 reubenhwk Exp $ * * Authors: * Lars Fenneberg <lf@elemental.net> @@ -266,62 +265,24 @@ int set_interface_linkmtu(const char iface, uint32_t mtu) { - if (privsep_enabled()) - return privsep_interface_linkmtu(iface, mtu); - - return set_interface_var(iface, - PROC_SYS_IP6_LINKMTU, "LinkMTU", - mtu); + return privsep_interface_linkmtu(iface, mtu); } int set_interface_curhlim(const char iface, uint8_t hlim) { - if (privsep_enabled()) - return privsep_interface_curhlim(iface, hlim); - - return set_interface_var(iface, - PROC_SYS_IP6_CURHLIM, "CurHopLimit", - hlim); + return privsep_interface_curhlim(iface, hlim); } int set_interface_reachtime(const char iface, uint32_t rtime) { - int ret; - - if (privsep_enabled()) - return privsep_interface_reachtime(iface, rtime); - - ret = set_interface_var(iface, - PROC_SYS_IP6_BASEREACHTIME_MS, - NULL, - rtime); - if (ret) - ret = set_interface_var(iface, - PROC_SYS_IP6_BASEREACHTIME, - "BaseReachableTimer", - rtime / 1000); / sec / - return ret; + return privsep_interface_reachtime(iface, rtime); } int set_interface_retranstimer(const char iface, uint32_t rettimer) { - int ret; - - if (privsep_enabled()) - return privsep_interface_retranstimer(iface, rettimer); - - ret = set_interface_var(iface, - PROC_SYS_IP6_RETRANSTIMER_MS, - NULL, - rettimer); - if (ret) - ret = set_interface_var(iface, - PROC_SYS_IP6_RETRANSTIMER, - "RetransTimer", - rettimer / 1000 * USER_HZ); /* XXX user_hz */ - return ret; + return privsep_interface_retranstimer(iface, rettimer); }
[-] [+]	Changed	radvd-1.8.5.tar.bz2/gram.y ^
@@ -1,5 +1,4 @@ /* - * $Id: gram.y,v 1.40 2011/08/19 16:37:05 reubenhwk Exp $ * * Authors: * Pedro Roque <roque@di.fc.ul.pt>
[-] [+]	Changed	radvd-1.8.5.tar.bz2/includes.h ^
@@ -1,5 +1,4 @@ /* - * $Id: includes.h,v 1.15 2010/12/14 11:58:21 psavola Exp $ * * Authors: * Lars Fenneberg <lf@elemental.net>
[-] [+]	Changed	radvd-1.8.5.tar.bz2/interface.c ^
@@ -1,5 +1,4 @@ /* - * $Id: interface.c,v 1.27 2011/04/28 15:08:40 reubenhwk Exp $ * * Authors: * Lars Fenneberg <lf@elemental.net>
[-] [+]	Changed	radvd-1.8.5.tar.bz2/log.c ^
@@ -1,5 +1,4 @@ /* - * $Id: log.c,v 1.12 2010/12/14 11:58:21 psavola Exp $ * * Authors: * Lars Fenneberg <lf@elemental.net> @@ -113,29 +112,23 @@ dlog(int prio, int level, char format, ...) { va_list ap; - int res; if (debug_level < level) return; va_start(ap, format); - res = vlog(prio, format, ap); + vlog(prio, format, ap); va_end(ap); - - / XXX: should we do something if res < 0.. / } void flog(int prio, char format, ...) { va_list ap; - int res; va_start(ap, format); - res = vlog(prio, format, ap); + vlog(prio, format, ap); va_end(ap); - - /* XXX: should we do something if res < 0.. */ } int @@ -160,13 +153,6 @@ return 0; } -int -log_reopen(void) -{ - log_close(); - return log_open(log_method, log_ident, log_file, log_facility); -} - void set_debuglevel(int level) {
[-] [+]	Changed	radvd-1.8.5.tar.bz2/log.h ^
@@ -1,5 +1,4 @@ /* - * $Id: log.h,v 1.1 2011/02/07 00:26:48 reubenhwk Exp $ * * Authors: * Lars Fenneberg <lf@elemental.net>
[-] [+]	Changed	radvd-1.8.5.tar.bz2/netlink.c ^
@@ -1,5 +1,4 @@ /* - * $Id: netlink.c,v 1.1 2011/02/25 04:17:23 reubenhwk Exp $ * * Authors: * Lars Fenneberg <lf@elemental.net> @@ -39,7 +38,6 @@ struct nlmsghdr nh; struct ifinfomsg ifinfo; char ifname[IF_NAMESIZE] = {""}; - char * rc = 0; len = recvmsg (sock, &msg, 0); if (len == -1) { @@ -57,14 +55,14 @@ } /* Continue with parsing payload. / - ifinfo = NLMSG_DATA(nh); - rc = if_indextoname(ifinfo->ifi_index, ifname); - if (ifinfo->ifi_flags & IFF_RUNNING) { - dlog(LOG_DEBUG, 3, "%s, ifindex %d, flags is running", ifname, ifinfo->ifi_index); - } - else { - dlog(LOG_DEBUG, 3, "%s, ifindex %d, flags is NOT* running", ifname, ifinfo->ifi_index); - } + ifinfo = NLMSG_DATA(nh); + if_indextoname(ifinfo->ifi_index, ifname); + if (ifinfo->ifi_flags & IFF_RUNNING) { + dlog(LOG_DEBUG, 3, "%s, ifindex %d, flags is running", ifname, ifinfo->ifi_index); + } + else { + dlog(LOG_DEBUG, 3, "%s, ifindex %d, flags is NOT running", ifname, ifinfo->ifi_index); + } reload_config(); } }
[-] [+]	Changed	radvd-1.8.5.tar.bz2/netlink.h ^
@@ -1,5 +1,4 @@ /* - * $Id: netlink.h,v 1.1 2011/02/25 04:17:23 reubenhwk Exp $ * * Authors: * Lars Fenneberg <lf@elemental.net>
[-] [+]	Changed	radvd-1.8.5.tar.bz2/pathnames.h ^
@@ -1,5 +1,4 @@ /* - * $Id: pathnames.h,v 1.9 2010/12/14 11:58:21 psavola Exp $ * * Authors: * Pedro Roque <roque@di.fc.ul.pt>
[-] [+]	Changed	radvd-1.8.5.tar.bz2/privsep-linux.c ^
@@ -1,5 +1,4 @@ /* - * $Id: privsep-linux.c,v 1.6 2011/02/28 10:53:07 reubenhwk Exp $ * * Authors: * Jim Paris <jim@jtan.com> @@ -115,15 +114,6 @@ } } -/* Return 1 if privsep is currently enabled / -int -privsep_enabled(void) -{ - if (pfd < 0) - return 0; - return 1; -} - / Fork to create privileged process connected by a pipe */ int privsep_init(void) @@ -131,9 +121,6 @@ int pipefds[2]; pid_t pid; - if (privsep_enabled()) - return 0; - if (pipe(pipefds) != 0) { flog(LOG_ERR, "Couldn't create privsep pipe."); return (-1);
[-] [+]	Changed	radvd-1.8.5.tar.bz2/process.c ^
@@ -1,5 +1,4 @@ /* - * $Id: process.c,v 1.29 2011/08/19 16:37:05 reubenhwk Exp $ * * Authors: * Pedro Roque <roque@di.fc.ul.pt>
[-] [+]	Changed	radvd-1.8.5.tar.bz2/radvd.8.man ^
@@ -1,5 +1,4 @@ .\" -.\" $Id: radvd.8.man,v 1.15 2011/01/05 08:19:23 psavola Exp $ .\" .\" Authors: .\" Lars Fenneberg <lf@elemental.net>
[-] [+]	Changed	radvd-1.8.5.tar.bz2/radvd.c ^
@@ -1,5 +1,4 @@ /* - * $Id: radvd.c,v 1.62 2011/06/07 04:53:42 reubenhwk Exp $ * * Authors: * Pedro Roque <roque@di.fc.ul.pt> @@ -39,9 +38,9 @@ " -l, --logfile=PATH Sets the log file.\n" " -m, --logmethod=X Sets the log method to one of: syslog, stderr, stderr_syslog, logfile, or none.\n" " -p, --pidfile=PATH Sets the pid file.\n" -" -s, --singleprocess Use privsep.\n" " -t, --chrootdir=PATH Chroot to the specified path.\n" " -u, --username=USER Switch to the specified user.\n" +" -n, --nodaemon Prevent the daemonizing.\n" " -v, --version Print the version and quit.\n" }; @@ -58,13 +57,14 @@ {"version", 0, 0, 'v'}, {"help", 0, 0, 'h'}, {"singleprocess", 0, 0, 's'}, + {"nodaemon", 0, 0, 'n'}, {NULL, 0, 0, 0} }; #else char usage_str[] = - "[-hsvc] [-d level] [-C config_file] [-m log_method] [-l log_file]\n" + "[-hsvcn] [-d level] [-C config_file] [-m log_method] [-l log_file]\n" "\t[-f facility] [-p pid_file] [-u username] [-t chrootdir]"; #endif @@ -93,20 +93,20 @@ int drop_root_privileges(const char ); int readin_config(char ); int check_conffile_perm(const char , const char ); +pid_t strtopid(char const * pidstr); +void write_pid_file(char const ); void main_loop(void); int main(int argc, char argv[]) { - char pidstr[16]; - ssize_t ret; int c, log_method; char logfile, pidfile; - int facility, fd; + int facility; char username = NULL; char chrootdir = NULL; int configtest = 0; - int singleprocess = 0; + int daemonize = 1; #ifdef HAVE_GETOPT_LONG int opt_idx; #endif @@ -122,7 +122,7 @@ pidfile = PATH_RADVD_PID; /* parse args / -#define OPTIONS_STR "d:C:l:m:p:t:u:vhcs" +#define OPTIONS_STR "d:C:l:m:p:t:u:vhcsn" #ifdef HAVE_GETOPT_LONG while ((c = getopt_long(argc, argv, OPTIONS_STR, prog_opt, &opt_idx)) > 0) #else @@ -185,7 +185,10 @@ configtest = 1; break; case 's': - singleprocess = 1; + fprintf(stderr, "privsep is not optional. This options will be removed in a near future release."); + break; + case 'n': + daemonize = 0; break; case 'h': usage(); @@ -266,22 +269,68 @@ exit(0); } +#ifdef USE_PRIVSEP + dlog(LOG_DEBUG, 3, "Initializing privsep"); + if (privsep_init() < 0) { + perror("Failed to initialize privsep."); + exit(1); + } +#endif + / drop root privileges if requested. / if (username) { - if (!singleprocess) { - dlog(LOG_DEBUG, 3, "Initializing privsep"); - if (privsep_init() < 0) { - perror("Failed to initialize privsep."); - exit(1); - } - } - if (drop_root_privileges(username) < 0) { perror("drop_root_privileges"); exit(1); } } + / + * okay, config file is read in, socket and stuff is setup, so + * lets fork now... + / + + if (get_debuglevel() == 0) { + + if (daemonize) { + / Detach from controlling terminal / + if (daemon(0, 0) < 0) + perror("daemon"); + } + } + + write_pid_file(pidfile); + + / + * config signal handlers + / + signal(SIGHUP, sighup_handler); + signal(SIGTERM, sigterm_handler); + signal(SIGINT, sigint_handler); + signal(SIGUSR1, sigusr1_handler); + + config_interface(); + kickoff_adverts(); + main_loop(); + flog(LOG_INFO, "sending stop adverts", pidfile); + stop_adverts(); + flog(LOG_INFO, "removing %s", pidfile); + unlink(pidfile); + + return 0; +} + + +pid_t strtopid(char const pidstr) +{ + return atol(pidstr); +} + +void write_pid_file(char const * pidfile) +{ + int fd, ret; + char pidstr[32]; + if ((fd = open(pidfile, O_RDONLY, 0)) > 0) { ret = read(fd, pidstr, sizeof(pidstr) - 1); @@ -290,11 +339,14 @@ flog(LOG_ERR, "cannot read radvd pid file, terminating: %s", strerror(errno)); exit(1); } - pidstr[ret] = '\0'; - if (!kill((pid_t)atol(pidstr), 0)) - { - flog(LOG_ERR, "radvd already running, terminating."); - exit(1); + if (ret > 0) { + pid_t pid; + pidstr[ret] = '\0'; + pid = strtopid(pidstr); + if (pid > 0 && !kill(pid, 0)) { + flog(LOG_ERR, "radvd already running, terminating."); + exit(1); + } } close(fd); fd = open(pidfile, O_CREAT\|O_TRUNC\|O_WRONLY, 0644); @@ -308,38 +360,6 @@ exit(1); } - /* - * okay, config file is read in, socket and stuff is setup, so - * lets fork now... - / - - if (get_debuglevel() == 0) { - - / Detach from controlling terminal / - if (daemon(0, 0) < 0) - perror("daemon"); - - / close old logfiles, including stderr / - log_close(); - - / reopen logfiles, but don't log to stderr unless explicitly requested / - if (log_method == L_STDERR_SYSLOG) - log_method = L_SYSLOG; - if (log_open(log_method, pname, logfile, facility) < 0) { - perror("log_open"); - exit(1); - } - - } - - / - * config signal handlers - */ - signal(SIGHUP, sighup_handler); - signal(SIGTERM, sigterm_handler); - signal(SIGINT, sigint_handler); - signal(SIGUSR1, sigusr1_handler); - snprintf(pidstr, sizeof(pidstr), "%ld\n", (long)getpid()); ret = write(fd, pidstr, strlen(pidstr)); @@ -350,14 +370,6 @@ } close(fd); - - config_interface(); - kickoff_adverts(); - main_loop(); - stop_adverts(); - unlink(pidfile); - - return 0; } void main_loop(void) @@ -433,7 +445,7 @@ timer_handler(next); } else if ( rc == -1 ) { - flog(LOG_ERR, "poll error: %s", strerror(errno)); + dlog(LOG_INFO, 3, "poll returned early: %s", strerror(errno)); } if (sigterm_received \|\| sigint_received) { @@ -443,12 +455,14 @@ if (sighup_received) { + dlog(LOG_INFO, 3, "sig hup received.\n"); reload_config(); sighup_received = 0; } if (sigusr1_received) { + dlog(LOG_INFO, 3, "sig usr1 received.\n"); reset_prefix_lifetimes(); sigusr1_received = 0; } @@ -557,12 +571,6 @@ flog(LOG_INFO, "attempting to reread config file"); - dlog(LOG_DEBUG, 4, "reopening log"); - if (log_reopen() < 0) { - perror("log_reopen"); - exit(1); - } - iface=IfaceList; while(iface) {
[-] [+]	Changed	radvd-1.8.5.tar.bz2/radvd.conf.5.man ^
@@ -1,5 +1,4 @@ .\" -.\" $Id: radvd.conf.5.man,v 1.41 2011/05/10 21:55:10 reubenhwk Exp $ .\" .\" Authors: .\" Lars Fenneberg <lf@elemental.net>
[-] [+]	Changed	radvd-1.8.5.tar.bz2/radvd.h ^
@@ -1,5 +1,4 @@ /* - * $Id: radvd.h,v 1.42 2011/04/28 15:08:40 reubenhwk Exp $ * * Authors: * Pedro Roque <roque@di.fc.ul.pt>
[-] [+]	Changed	radvd-1.8.5.tar.bz2/radvdump.8.man ^
@@ -1,5 +1,4 @@ .\" -.\" $Id: radvdump.8.man,v 1.7 2011/01/05 08:21:42 psavola Exp $ .\" .\" Authors: .\" Lars Fenneberg <lf@elemental.net>
[-] [+]	Changed	radvd-1.8.5.tar.bz2/radvdump.c ^
@@ -1,5 +1,4 @@ /* - * $Id: radvdump.c,v 1.25 2011/02/28 10:53:07 reubenhwk Exp $ * * Authors: * Lars Fenneberg <lf@elemental.net>
[-] [+]	Changed	radvd-1.8.5.tar.bz2/recv.c ^
@@ -1,5 +1,4 @@ /* - * $Id: recv.c,v 1.14 2011/02/06 03:41:38 reubenhwk Exp $ * * Authors: * Pedro Roque <roque@di.fc.ul.pt>
[-] [+]	Changed	radvd-1.8.5.tar.bz2/redhat/radvd.init ^
@@ -1,6 +1,5 @@ #! /bin/sh # -# $Id: radvd.init,v 1.7 2010/03/05 12:14:47 psavola Exp $ # # chkconfig: - 54 46 # description: radvd is the router advertisement daemon for IPv6. It \
[-] [+]	Changed	radvd-1.8.5.tar.bz2/redhat/radvd.spec ^
@@ -1,4 +1,3 @@ -# $Id: radvd.spec,v 1.31 2011/05/06 14:32:12 reubenhwk Exp $ %define initdir %{_sysconfdir}/rc.d/init.d @@ -6,7 +5,7 @@ Summary: A Router Advertisement daemon Name: radvd -Version: 1.8.3 +Version: 1.8.5 Release: 1 # The code includes the advertising clause, so it's GPL-incompatible License: BSD with advertising @@ -97,6 +96,15 @@ %{_sbindir}/radvdump %changelog +* Wed Jan 25 2012 Reuben Hawkins <reubenhwk@gmail.com> 1.8.5-1 +- 1.8.5 +- PID file had wrong PID. This release fixes the PID. + +* Thu Jan 21 2012 Reuben Hawkins <reubenhwk@gmail.com> 1.8.4-1 +- 1.8.4 +- privsep always on +- minor logging changes + * Fri Oct 14 2011 Reuben Hawkins <reubenhwk@gmail.com> 1.8.3-1 - 1.8.3 - minor fixes
[-] [+]	Changed	radvd-1.8.5.tar.bz2/redhat/radvd.sysconfig ^
@@ -1,4 +1,3 @@ -# $Id: radvd.sysconfig,v 1.1 2001/11/14 19:58:11 lutchann Exp $ # No chroot; /var/run/radvd must be owned by -u. OPTIONS="-u radvd"
[-] [+]	Changed	radvd-1.8.5.tar.bz2/scanner.l ^
@@ -1,5 +1,4 @@ /* - * $Id: scanner.l,v 1.29 2011/05/07 02:09:40 reubenhwk Exp $ * * Authors: * Pedro Roque <roque@di.fc.ul.pt>
[-] [+]	Changed	radvd-1.8.5.tar.bz2/send.c ^
@@ -1,5 +1,4 @@ /* - * $Id: send.c,v 1.48 2011/05/06 07:51:54 reubenhwk Exp $ * * Authors: * Pedro Roque <roque@di.fc.ul.pt>
[-] [+]	Changed	radvd-1.8.5.tar.bz2/socket.c ^
@@ -1,5 +1,4 @@ /* - * $Id: socket.c,v 1.8 2010/12/14 11:58:21 psavola Exp $ * * Authors: * Pedro Roque <roque@di.fc.ul.pt>
[-] [+]	Changed	radvd-1.8.5.tar.bz2/timer.c ^
@@ -1,5 +1,4 @@ /* - * $Id: timer.c,v 1.12 2011/02/22 00:20:40 reubenhwk Exp $ * * Authors: * Pedro Roque <roque@di.fc.ul.pt>
[-] [+]	Changed	radvd-1.8.5.tar.bz2/util.c ^
@@ -1,5 +1,4 @@ /* - * $Id: util.c,v 1.12 2010/12/14 11:58:21 psavola Exp $ * * Authors: * Lars Fenneberg <lf@elemental.net>