From 7b1bb67ede38a0f6a4fea418bb826f592cb6a1c9 Mon Sep 17 00:00:00 2001 From: Fedor Date: Tue, 6 Oct 2009 17:41:10 -0400 Subject: [PATCH] igmpproxy 0.1 --- release/src/router/igmpproxy/AUTHORS | 11 +- release/src/router/igmpproxy/ChangeLog | 325 +++++++++++++++++++++++++- release/src/router/igmpproxy/Makefile.am | 7 + release/src/router/igmpproxy/Makefile.in | 7 + release/src/router/igmpproxy/config.guess | 88 +++---- release/src/router/igmpproxy/config.sub | 28 ++- release/src/router/igmpproxy/configure | 20 +- release/src/router/igmpproxy/configure.ac | 2 +- release/src/router/igmpproxy/src/os-freebsd.h | 8 + 9 files changed, 410 insertions(+), 86 deletions(-) rewrite release/src/router/igmpproxy/ChangeLog (98%) diff --git a/release/src/router/igmpproxy/AUTHORS b/release/src/router/igmpproxy/AUTHORS index db0e8bd2c3..7023323531 100644 --- a/release/src/router/igmpproxy/AUTHORS +++ b/release/src/router/igmpproxy/AUTHORS @@ -1,10 +1,9 @@ -Original author: -Johnny Egeland - -Maintainer: -Constantin Baranov +Authors and contributors, in alphabetical order: -Contributors: Alexey Charkov Christian Ruppert Conrad Kostecki +Constantin Baranov +Damjan Cvetko +Johnny Egeland +Martin Djernaes diff --git a/release/src/router/igmpproxy/ChangeLog b/release/src/router/igmpproxy/ChangeLog dissimilarity index 98% index 4c8a2a8b03..e8461bbd63 100644 --- a/release/src/router/igmpproxy/ChangeLog +++ b/release/src/router/igmpproxy/ChangeLog @@ -1,8 +1,317 @@ -The changelog of the igmpproxy starting from 0.1-beta2 release -can be viewed at - - http://igmpproxy.git.sourceforge.net/git/gitweb.cgi?p=igmpproxy - -or as part of the Git repository which is accessible via - - git://igmpproxy.git.sourceforge.net/gitroot/igmpproxy +commit 0e8e7fde2d68f9ea9b5095c24231024be281393c +Author: Constantin Baranov +Date: Mon Oct 5 21:31:42 2009 +0500 + + Release 0.1 + +commit 68ba90446e02825073b779bd0628c4f34833665d +Author: Constantin Baranov +Date: Thu Oct 1 00:09:38 2009 +0500 + + Fix building on FreeBSD 8.0 (wrt #2870461) + + Several IGMP_* macroses was deprecated in r189347/v800069 and + removed in r193938/v800098. Redefine them if needed. + +commit 74c2e1aa414f33585562d6783a3290ac63ee6c69 +Author: Martin Djernaes +Date: Sun Sep 6 16:41:22 2009 +0500 + + Fix netmask detection on interfaces with multiple addresses + + When having multiple IP addresses on an interface the netmask retrieved for + each IP address is not correct. The reason is that ioctrl for + SIOCGIFNETMASK will just provide the first netmask when no IP address is + provided in the call. + +commit 64144607195b779396a49179518aade24707cbbc +Author: Constantin Baranov +Date: Fri Sep 4 01:38:27 2009 +0500 + + Generate ChangeLog and AUTHORS by Git + +commit 94dd711318384e7b121924db0177a65b2fc38471 +Author: Constantin Baranov +Date: Sun Aug 16 19:45:04 2009 +0500 + + Release 0.1 beta5 + +commit 3ac424f82ab9f281dd3a0bfccbc92352bd5512c0 +Author: Damjan Cvetko +Date: Sun Aug 16 19:28:30 2009 +0500 + + Improve getIfByAddress() function (wrt #2835052) + + getIfByAddress does not find the best iterface in case of overlaping + networks. This patchs scans through all interfaces (and networks) and picks + the one with the longest subnet. + +commit 8ca5a29b56390020f27d4106643cd623cdb12bb2 +Author: Constantin Baranov +Date: Sun Aug 16 18:37:58 2009 +0500 + + Fix nextConfigToken() function (wrt #2838154) + + The nextConfigToken() returns NULL when EOF reached even if token + was read already. This results in loss of last token in file usually. + Let it return unterminated token if it is non-empty already. + +commit 954674bc4ec6a689b1de2f2a2766e993df1e2705 +Author: Constantin Baranov +Date: Thu May 14 01:14:56 2009 +0500 + + Release 0.1 beta4 + +commit a7908b855ecb6959ea08ef3b374ff2aca9939cf0 +Author: Constantin Baranov +Date: Thu May 14 01:10:35 2009 +0500 + + Update README etc. + +commit 62fa19975ff4daa8e31a9b07bf33ddc8cd0129f8 +Author: Constantin Baranov +Date: Thu May 14 01:06:44 2009 +0500 + + State licenses in the COPYING + +commit 3ac3ae462ca35ec7f1f22d968bf4fab0807d636f +Author: Constantin Baranov +Date: Sun May 10 05:01:21 2009 +0500 + + Remove pointless backslashes in configure.ac + +commit 3c4118949b6a19b384b08e171a5294b0ea307e08 +Author: Constantin Baranov +Date: Sun May 10 02:19:30 2009 +0500 + + Replace bzero() with memset() + +commit ee07cb5bfd2514503d0564d2aee0656203d9a91e +Author: Constantin Baranov +Date: Sat May 9 02:09:28 2009 +0500 + + Remove redundant #include + +commit 56e37ad6ba0c6aade86c1407ea55abb8b445d119 +Author: Constantin Baranov +Date: Sat May 9 02:00:03 2009 +0500 + + Add DragonFly BSD support + +commit eccefd205c3fb326b6ae1b79676238fc349f8be8 +Author: Constantin Baranov +Date: Sat May 9 01:57:07 2009 +0500 + + Add missed format argument in acceptLeaveMessage() + +commit 16c55bd5ab6a9608099252fa320ddbc0a05fca0a +Author: Constantin Baranov +Date: Wed May 6 01:29:04 2009 +0500 + + Avoid inclusion if linux/in.h (wrt #2787118) + + The linux/in.h header conflicts with the netinet/in.h header in + certain Linux distributions. So let's ensure that linux/in.h will + never be included neither directly nor from linux/mroute.h. + +commit e01624e123c5a24310a4fb7f70ab6178278c3b7a +Author: Constantin Baranov +Date: Sun May 3 22:00:33 2009 +0500 + + Release 0.1 beta3 + +commit a3c84e48a1ff32812aac92ca0dba923ca7dd4ca0 +Author: Constantin Baranov +Date: Sun May 3 21:53:56 2009 +0500 + + Show version in help message + + Also remove unused Version constant. + +commit f880a472f6b835d8139adc27908206a11a50846f +Author: Constantin Baranov +Date: Sun May 3 21:43:01 2009 +0500 + + Remove IF_DEBUG macros + + IF_DEBUG macros hides my_log(LOG_DEBUG...) calls. Thus it is redundant. + +commit 6b1a4beb839f41ecc7468e2680f5d0eedbd49b35 +Author: Constantin Baranov +Date: Sun May 3 21:29:16 2009 +0500 + + Break long lines in build scripts + +commit 55dcd57b8cfac25a4eeafae5a18ab85a07484418 +Author: Constantin Baranov +Date: Sun May 3 21:19:19 2009 +0500 + + Remove hardcoded version strings from man pages + +commit e7880c542e38bae8efa16b148a431488456f5594 +Author: Constantin Baranov +Date: Sun May 3 20:52:58 2009 +0500 + + Move mrouted-LICENSE out of doc directory + +commit 9fee127b13336776d2e6019db8c22ee7de9bf36f +Author: Constantin Baranov +Date: Sun May 3 20:32:31 2009 +0500 + + Use strdup() instead of malloc() and strcpy() + +commit d34dee7ea0b03ba98806558a1eebf78061ce8878 +Author: Constantin Baranov +Date: Sun May 3 20:30:44 2009 +0500 + + Eliminate message about IGMP_MEMBERSHIP_QUERY ignored + +commit 32de2bfbad537f6e60edddaefa6c240b2811c567 +Author: Constantin Baranov +Date: Sun May 3 20:25:30 2009 +0500 + + Add OpenBSD support + +commit a85c620eccea244c80a34c3403b2ea7055616703 +Author: Constantin Baranov +Date: Sun May 3 04:16:53 2009 +0500 + + Add NetBSD support + +commit d61d57c50b8b2399ff90e32da687686cf068680a +Author: Constantin Baranov +Date: Sat May 2 05:07:12 2009 +0500 + + Remove outdated bug report email address + +commit 14edc6d6dab34e5e51bc12a61f45bae753235e98 +Author: Constantin Baranov +Date: Sat May 2 04:49:38 2009 +0500 + + Improve OS checking mechanism + + Hide all OS-specific things in os-*.h headers and let autoconf select + proper header. Also add check for struct sockaddr_in.sin_len member. + +commit b23a4c9f9edd43a22759930ae969ee420c270456 +Author: Constantin Baranov +Date: Sat May 2 04:48:23 2009 +0500 + + Do not close std* streams in non-debug mode + +commit 7256cb378db4b839f0138cc9422971f5fb353de1 +Author: Constantin Baranov +Date: Fri Apr 17 21:16:47 2009 +0500 + + Clean up configure.ac and add check for sockaddr.sa_len member + +commit eb6f3eababbca43c517a1407e5af66ed384bf07d +Author: Constantin Baranov +Date: Fri Apr 17 20:04:32 2009 +0500 + + Install igmpproxy to sbin directory + +commit e22427f33150970f6bef3106ac018d7138dfbadb +Author: Constantin Baranov +Date: Fri Apr 17 20:03:46 2009 +0500 + + Add missing igmpproxy.h to list of sources + +commit 68fb7638f36c85c44b2a8a33e28af58c65de8a06 +Author: Christian Ruppert +Date: Thu Apr 9 21:28:04 2009 +0500 + + Add missing 'h' to the getopt() optstring + +commit bae0b7b42ec948442945648878dbc8ef3ee1d2c5 +Author: Constantin Baranov +Date: Sat Apr 4 00:38:37 2009 +0500 + + Rework logging + + Allow to control verbosity with -v option. + Don't write to syslog in debug mode. + Don't fork in background. Let start-stop-deamon do this. + + Also update man-pages and help messages. + +commit df0ffb7998cbbd3ab09c100f48dead6adb93aa2c +Author: Constantin Baranov +Date: Sat Apr 4 00:38:06 2009 +0500 + + Move igmpproxy.conf out of src directory + +commit 4c36c1ea8f9822f96031cff8f40ca3fc7cb93db3 +Author: Constantin Baranov +Date: Mon Mar 9 22:03:46 2009 +0400 + + Initial FreeBSD support + + Based on IGMPproxy port to FreeBSD made by + Pavel Korshunov and gygenot. + +commit fdc5cc59655a59f7f73af78d6606b5c45b9c1071 +Author: Constantin Baranov +Date: Sun Mar 8 20:37:17 2009 +0400 + + Move to C99 and clean up the code + + Listen to compiler's warnings. + Use standard integer and boolean types. + Remove redundant version.h. + +commit b535f70ec3dfc73a767592739c8aa44583e7e833 +Author: Constantin Baranov +Date: Sun Mar 8 17:53:24 2009 +0400 + + Rename defs.h to igmpproxy.h + +commit 2df90756d378de822d6ece6aa0a340cab6a489e4 +Author: Constantin Baranov +Date: Sun Mar 8 16:17:20 2009 +0400 + + Add bootstrap script + +commit 3393d1cd7c0f13cc91fa3ec974eb2cd1409bb720 +Author: Constantin Baranov +Date: Fri Feb 27 22:28:03 2009 +0400 + + Remove stuff generated by autotools + +commit 576b42c7fc71757a33dbac0ebc388f8eebd81fe3 +Author: Constantin Baranov +Date: Mon Feb 23 00:36:39 2009 +0400 + + Fix logging to syslog + + Do not write textual representation of message severity + because syslog can do this itself. Also write only one + string at a time. + +commit 1223d5975a1da679d15120417365582a0054abc4 +Author: Constantin Baranov +Date: Mon Feb 23 00:22:20 2009 +0400 + + chmod -x on appropriate files + +commit 66145eee1d74c9edd23f3d72700911865b7a09bb +Author: Conrad Kostecki +Date: Mon Feb 23 00:18:48 2009 +0400 + + Remove banner + +commit 710d688641ca68d89a7b8958c7d84144d5fb1d9b +Author: Alexey Charkov +Date: Mon Feb 23 00:13:03 2009 +0400 + + Enable autotools + + I've packaged igmpproxy with GNU autotools, which will allow for a better + experience on Gentoo (CFLAGS, directory structure etc). Also, compile-time + warnings are fixed. As the project is dead, this is not even a fork :) + +commit f4c36aa73287b794e2c842564e82d2d4f3c1027f +Author: Johnny Egeland +Date: Mon Feb 23 00:10:48 2009 +0400 + + Initial import diff --git a/release/src/router/igmpproxy/Makefile.am b/release/src/router/igmpproxy/Makefile.am index 30a8e7c0f4..b569f48e24 100644 --- a/release/src/router/igmpproxy/Makefile.am +++ b/release/src/router/igmpproxy/Makefile.am @@ -1,3 +1,10 @@ SUBDIRS = doc src EXTRA_DIST = GPL.txt Stanford.txt dist_sysconf_DATA = igmpproxy.conf + +ChangeLog: + git --git-dir=$(srcdir)/.git log > $@ + +AUTHORS: ChangeLog + ( echo "Authors and contributors, in alphabetical order: "; echo; \ + sed -r "s/^Author: (.*)/\1/;t;d" $< | sort -u ) > $@ diff --git a/release/src/router/igmpproxy/Makefile.in b/release/src/router/igmpproxy/Makefile.in index 1a14945afe..508f703368 100644 --- a/release/src/router/igmpproxy/Makefile.in +++ b/release/src/router/igmpproxy/Makefile.in @@ -727,6 +727,13 @@ uninstall-am: uninstall-dist_sysconfDATA uninstall-dist_sysconfDATA +ChangeLog: + git --git-dir=$(srcdir)/.git log > $@ + +AUTHORS: ChangeLog + ( echo "Authors and contributors, in alphabetical order: "; echo; \ + sed -r "s/^Author: (.*)/\1/;t;d" $< | sort -u ) > $@ + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/release/src/router/igmpproxy/config.guess b/release/src/router/igmpproxy/config.guess index 84d5b85804..12734a71d7 100755 --- a/release/src/router/igmpproxy/config.guess +++ b/release/src/router/igmpproxy/config.guess @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 # Free Software Foundation, Inc. -timestamp='2009-02-03' +timestamp='2009-08-19' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -27,16 +27,16 @@ timestamp='2009-02-03' # the same distribution terms that you use for the rest of that program. -# Originally written by Per Bothner . -# Please send patches to . Submit a context -# diff and a properly formatted ChangeLog entry. +# Originally written by Per Bothner. Please send patches (context +# diff format) to 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,.*/,,'` @@ -139,7 +139,8 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown -if [ "${UNAME_SYSTEM}" = "Linux" ] ; then +case "${UNAME_SYSTEM}" in +Linux|GNU/*) eval $set_cc_for_build cat << EOF > $dummy.c #include @@ -154,7 +155,8 @@ if [ "${UNAME_SYSTEM}" = "Linux" ] ; then #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep LIBC= | sed -e 's: ::g'` -fi + ;; +esac # Note: order is significant - the case branches are not exclusive. @@ -187,7 +189,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep __ELF__ >/dev/null + | grep -q __ELF__ then # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). # Return netbsd for either. FIX? @@ -341,6 +343,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in case `/usr/bin/uname -p` in sparc) echo sparc-icl-nx7; exit ;; esac ;; + s390x:SunOS:*:*) + echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; @@ -670,7 +675,7 @@ EOF # => hppa64-hp-hpux11.23 if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | - grep __LP64__ >/dev/null + grep -q __LP64__ then HP_ARCH="hppa2.0w" else @@ -836,6 +841,9 @@ EOF [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; + 8664:Windows_NT:*) + echo x86_64-pc-mks + exit ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we @@ -860,7 +868,7 @@ EOF exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix @@ -896,40 +904,17 @@ EOF m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; - mips:Linux:*:*) + mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #undef CPU - #undef mips - #undef mipsel + #undef ${UNAME_MACHINE} + #undef ${UNAME_MACHINE}el #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mipsel + CPU=${UNAME_MACHINE}el #else #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips - #else - CPU= - #endif - #endif -EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^CPU/{ - s: ::g - p - }'`" - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } - ;; - mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef mips64 - #undef mips64el - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mips64el - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips64 + CPU=${UNAME_MACHINE} #else CPU= #endif @@ -961,12 +946,12 @@ EOF EV67) UNAME_MACHINE=alphaev67 ;; EV68*) UNAME_MACHINE=alphaev68 ;; esac - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null + objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC="gnulibc1" ; fi echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-gnu + echo sparc-unknown-linux-${LIBC} exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level @@ -1015,14 +1000,6 @@ EOF elf32-i386) TENTATIVE="${UNAME_MACHINE}-pc-linux-${LIBC}" ;; - a.out-i386-linux) - echo "${UNAME_MACHINE}-pc-linux-${LIBC}aout" - exit ;; - "") - # Either a pre-BFD a.out linker (linux-gnuoldld) or - # one that does not give us useful --help. - echo "${UNAME_MACHINE}-pc-linux-${LIBC}oldld" - exit ;; esac # This should get integrated into the C code below, but now we hack if [ "$LIBC" != "gnu" ] ; then echo "$TENTATIVE" && exit 0 ; fi @@ -1090,7 +1067,7 @@ EOF i*86:syllable:*:*) echo ${UNAME_MACHINE}-pc-syllable exit ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) echo i386-unknown-lynxos${UNAME_RELEASE} exit ;; i*86:*DOS:*:*) @@ -1134,8 +1111,11 @@ EOF pc:*:*:*) # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i386. - echo i386-pc-msdosdjgpp + # the processor, so we play safe by assuming i586. + # Note: whatever this is, it MUST be the same as what config.sub + # prints for the "djgpp" host, or else GDB configury will decide that + # this is a cross-build. + echo i586-pc-msdosdjgpp exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 @@ -1195,7 +1175,7 @@ EOF rs6000:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} exit ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) echo powerpc-unknown-lynxos${UNAME_RELEASE} exit ;; SM[BE]S:UNIX_SV:*:*) diff --git a/release/src/router/igmpproxy/config.sub b/release/src/router/igmpproxy/config.sub index 848a7a51e9..32437842bc 100755 --- a/release/src/router/igmpproxy/config.sub +++ b/release/src/router/igmpproxy/config.sub @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 # Free Software Foundation, Inc. -timestamp='2009-02-03' +timestamp='2009-08-19' # 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 @@ timestamp='2009-02-03' # Please send patches to . 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. @@ -149,10 +152,13 @@ case $os in -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray) + -apple | -axis | -knuth | -cray | -microblaze) os= basic_machine=$1 ;; + -bluegene*) + os=-cnk + ;; -sim | -cisco | -oki | -wec | -winbond) os= basic_machine=$1 @@ -272,6 +278,7 @@ case $basic_machine in | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ + | moxie \ | mt \ | msp430 \ | nios | nios2 \ @@ -336,7 +343,7 @@ case $basic_machine in | 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-* \ @@ -466,6 +473,10 @@ case $basic_machine in basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` os=-linux ;; + bluegene*) + basic_machine=powerpc-ibm + os=-cnk + ;; c90) basic_machine=c90-cray os=-unicos @@ -718,6 +729,9 @@ case $basic_machine in basic_machine=ns32k-utek os=-sysv ;; + microblaze) + basic_machine=microblaze-xilinx + ;; mingw32) basic_machine=i386-pc os=-mingw32 @@ -1277,7 +1291,7 @@ case $os in # Each alternative MUST END IN A *, to match a version number. # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ | -kopensolaris* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ @@ -1630,7 +1644,7 @@ case $basic_machine in -sunos*) vendor=sun ;; - -aix*) + -cnk*|-aix*) vendor=ibm ;; -beos*) diff --git a/release/src/router/igmpproxy/configure b/release/src/router/igmpproxy/configure index b2eccfe85c..1314ebf7b8 100755 --- a/release/src/router/igmpproxy/configure +++ b/release/src/router/igmpproxy/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for igmpproxy 0.1_beta5. +# Generated by GNU Autoconf 2.63 for igmpproxy 0.1. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. @@ -594,8 +594,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='igmpproxy' PACKAGE_TARNAME='igmpproxy' -PACKAGE_VERSION='0.1_beta5' -PACKAGE_STRING='igmpproxy 0.1_beta5' +PACKAGE_VERSION='0.1' +PACKAGE_STRING='igmpproxy 0.1' PACKAGE_BUGREPORT='' ac_unique_file="src/igmpproxy.c" @@ -1252,7 +1252,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures igmpproxy 0.1_beta5 to adapt to many kinds of systems. +\`configure' configures igmpproxy 0.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1322,7 +1322,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of igmpproxy 0.1_beta5:";; + short | recursive ) echo "Configuration of igmpproxy 0.1:";; esac cat <<\_ACEOF @@ -1407,7 +1407,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -igmpproxy configure 0.1_beta5 +igmpproxy configure 0.1 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1421,7 +1421,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by igmpproxy $as_me 0.1_beta5, which was +It was created by igmpproxy $as_me 0.1, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2270,7 +2270,7 @@ fi # Define the identity of the package. PACKAGE='igmpproxy' - VERSION='0.1_beta5' + VERSION='0.1' cat >>confdefs.h <<_ACEOF @@ -4403,7 +4403,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by igmpproxy $as_me 0.1_beta5, which was +This file was extended by igmpproxy $as_me 0.1, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4470,7 +4470,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -igmpproxy config.status 0.1_beta5 +igmpproxy config.status 0.1 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/release/src/router/igmpproxy/configure.ac b/release/src/router/igmpproxy/configure.ac index e1991b3ca9..85beb0820e 100644 --- a/release/src/router/igmpproxy/configure.ac +++ b/release/src/router/igmpproxy/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.63]) -AC_INIT([igmpproxy], [0.1_beta5]) +AC_INIT([igmpproxy], [0.1]) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([src/igmpproxy.c]) AC_CONFIG_HEADERS([config.h]) diff --git a/release/src/router/igmpproxy/src/os-freebsd.h b/release/src/router/igmpproxy/src/os-freebsd.h index b556f0d6bc..ca01cc5ea6 100644 --- a/release/src/router/igmpproxy/src/os-freebsd.h +++ b/release/src/router/igmpproxy/src/os-freebsd.h @@ -4,6 +4,14 @@ #include #include +#if __FreeBSD_version >= 800069 && defined BURN_BRIDGES \ + || __FreeBSD_version >= 800098 +#define IGMP_MEMBERSHIP_QUERY IGMP_HOST_MEMBERSHIP_QUERY +#define IGMP_V1_MEMBERSHIP_REPORT IGMP_v1_HOST_MEMBERSHIP_REPORT +#define IGMP_V2_MEMBERSHIP_REPORT IGMP_v2_HOST_MEMBERSHIP_REPORT +#define IGMP_V2_LEAVE_GROUP IGMP_HOST_LEAVE_MESSAGE +#endif + static inline u_short ip_data_len(const struct ip *ip) { return ip->ip_len; -- 2.11.4.GIT