FreeBSD compatibility patches

- update ipset and libpri to latest upstream

40 files changed, 33124 insertions, 28586 deletions

diff --git a/package/libnet/Makefile b/package/libnet/Makefile
index fbad8f90b..df76ac082 100644
--- a/package/libnet/Makefile
+++ b/package/libnet/Makefile
@@ -25,8 +25,8 @@ $(eval $(call PKG_template,LIBNET,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PK
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ENV+=		ac_libnet_have_pf_packet=yes \
-			ac_cv_lbl_unaligned_fail=no \
-			ac_cv_libnet_endianess=${ENDIAN}
+			ac_cv_libnet_endianess=${ENDIAN} \
+			ac_cv_lbl_unaligned_fail=no
 CONFIGURE_ARGS+=	--with-pf_packet=yes
 BUILD_STYLE=		auto
 INSTALL_STYLE=		auto
diff --git a/package/libnet/patches/500-debian-subset.patch b/package/libnet/patches/500-debian-subset.patch
deleted file mode 100644
index 87674b83f..000000000
--- a/package/libnet/patches/500-debian-subset.patch
+++ /dev/null
@@ -1,28584 +0,0 @@
-diff -ruN libnet-1.0.2a-orig/Makefile.am libnet-1.0.2a-7/Makefile.am
---- libnet-1.0.2a-orig/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ libnet-1.0.2a-7/Makefile.am	2005-03-08 03:53:26.000000000 +0100
-@@ -0,0 +1,10 @@
-+include $(top_srcdir)/Makefile.am.common
-+
-+SUBDIRS = src include
-+
-+EXTRA_DIST = Makefile.am.common
-+
-+bin_SCRIPTS = libnet-config
-+
-+version.h: VERSION
-+	sed -e 's/.*/#define VERSION "&"/' < $< > $@
-diff -ruN libnet-1.0.2a-orig/Makefile.am.common libnet-1.0.2a-7/Makefile.am.common
---- libnet-1.0.2a-orig/Makefile.am.common	1970-01-01 01:00:00.000000000 +0100
-+++ libnet-1.0.2a-7/Makefile.am.common	2005-03-08 03:53:26.000000000 +0100
-@@ -0,0 +1,3 @@
-+AUTOMAKE_OPTIONS = foreign no-dependencies
-+
-+DISTCLEANFILES = *~
-diff -ruN libnet-1.0.2a-orig/Makefile.in libnet-1.0.2a-7/Makefile.in
---- libnet-1.0.2a-orig/Makefile.in	2001-02-05 18:51:41.000000000 +0100
-+++ libnet-1.0.2a-7/Makefile.in	2005-03-08 03:53:26.000000000 +0100
-@@ -1,147 +1,620 @@
--#
--#   $Id: Makefile.in,v 1.1.1.1 2000/05/25 00:28:49 route Exp $
--#
--#   Libnet 1.0 makefile
--#   (c) 1998 - 2001  Mike D. Schiffman <mike@infonexus.com>
--#                                
--#   @configure_input@
--
--#   Enabled:    Dumps debugging info and verbose error information.
--#   Disabled:   Doesn't.
--#   default:    disabled.
--DEFINES     +=  #-D__DEBUG 
--prefix      =   @prefix@
--exec_prefix =   @exec_prefix@
--srcdir      =   @srcdir@
--BIN_PREFIX  =   @bindir@/
--INC_PREFIX  =   @includedir@/
--LIB_PREFIX  =   @libdir@/
--MAN_PREFIX  =   @MAN_PREFIX@
--
--LIBNET      =   libnet
--LIBPWRITE   =   libpwrite
--LIB         =   lib/$(LIBNET).a
--MAN         =   doc/$(LIBNET).3
--INCLUDE     =   include/$(LIBNET).h
--INCLUDE-H   =   include/$(LIBNET)/$(LIBNET)-headers.h
--INCLUDE-F   =   include/$(LIBNET)/$(LIBNET)-functions.h
--INCLUDE-S   =   include/$(LIBNET)/$(LIBNET)-structures.h
--INCLUDE-M   =   include/$(LIBNET)/$(LIBNET)-macros.h
--INCLUDE-A   =   include/$(LIBNET)/$(LIBNET)-asn1.h
--INCLUDE-O   =   include/$(LIBNET)/$(LIBNET)-ospf.h
--CONFIG      =   $(LIBNET)-config
--DEFINES     +=  @DEFS@
--RANLIB      =   @RANLIB@
--AR          =   @AR@
--LN          =   @LN@
--CC          =   @CC@
--ENSUREDIR   =   $(srcdir)/ensure-dir.sh
--INSTALL_DATA=   $(srcdir)/install-sh
--CFLAGS      =   @CFLAGS@
--CPPFLAGS    =   @CPPFLAGS@
--OBJECTS     =   src/libnet_resolve.o\
--		src/libnet_socket.o\
--		src/libnet_checksum.o\
--		src/libnet_prand.o\
--		src/libnet_version.o\
--		src/libnet_write_ip.o\
--		src/libnet_insert_ipo.o\
--		src/libnet_insert_tcpo.o\
--		src/libnet_error.o\
--		src/libnet_link_@LL_INT_TYPE@.o\
--		src/libnet_packet_mem.o\
--		src/libnet_build_ip.o\
--		src/libnet_build_tcp.o\
--		src/libnet_build_udp.o\
--		src/libnet_build_arp.o\
--		src/libnet_build_ethernet.o\
--		src/libnet_build_icmp.o\
--		src/libnet_build_igmp.o\
--		src/libnet_build_dns.o\
--		src/libnet_build_snmp.o\
--		src/libnet_build_rip.o\
--		src/libnet_build_ospf.o\
--		src/libnet_build_vrrp.o\
--		src/libnet_asn1.o\
--		src/libnet_hex_dump.o\
--		src/libnet_if_addr.o\
--		src/libnet_port_list.o 
--
--.c.o:
--	$(CC) $(CFLAGS) $(CPPFLAGS) $(DEFINES) -c $< -o $@
--
--all: libnet
--supp: test example
--
--libnet: version.h $(OBJECTS)
--	$(AR) -cr $(LIB) $(OBJECTS)
--	$(RANLIB) $(LIB)
--
--version.o: version.h
--version.h: ./VERSION
--	@rm -f $@
--	sed -e 's/.*/#define VERSION "&"/' ./VERSION > $@
--
--test:    libnet
--	cd test; make
--
--util:    libnet install
--	cd util; make
--
--example: libnet install
--	cd example; make
--
--install: libnet
--	$(ENSUREDIR) $(DESTDIR)$(prefix) 755
--	$(ENSUREDIR) $(DESTDIR)$(LIB_PREFIX) 755
--	$(ENSUREDIR) $(DESTDIR)$(INC_PREFIX)$(LIBNET) 755
--	$(ENSUREDIR) $(DESTDIR)$(INC_PREFIX) 755
--	$(ENSUREDIR) $(DESTDIR)$(MAN_PREFIX) 755
--	$(ENSUREDIR) $(DESTDIR)$(BIN_PREFIX) 755
--	$(INSTALL_DATA) $(LIB) $(DESTDIR)$(LIB_PREFIX)
--	rm -f $(DESTDIR)$(LIB_PREFIX)$(LIBPWRITE).a
--	cd $(DESTDIR)$(LIB_PREFIX); $(LN) -f -s $(LIBNET).a $(LIBPWRITE).a
--	$(INSTALL_DATA) $(INCLUDE) $(DESTDIR)$(INC_PREFIX)
--	$(INSTALL_DATA) $(INCLUDE-H) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
--	$(INSTALL_DATA) $(INCLUDE-F) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
--	$(INSTALL_DATA) $(INCLUDE-S) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
--	$(INSTALL_DATA) $(INCLUDE-M) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
--	$(INSTALL_DATA) $(INCLUDE-A) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
--	$(INSTALL_DATA) $(INCLUDE-O) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
--	$(INSTALL_DATA) $(MAN) $(DESTDIR)$(MAN_PREFIX)
--	$(INSTALL_DATA) $(CONFIG) $(DESTDIR)$(BIN_PREFIX)
--
--
--
--clean:
--	if test -f test/Makefile; then \
--	    cd test && make clean; \
--	fi
--	if test -f example/Makefile; then \
--	    cd example && make clean; \
--	fi
--	if test -f util/Makefile; then \
--	    cd util && make clean; \
--	fi
--	if test -f support/bpf-lkm/etherspoof; then \
--	    cd support/bpf-lkm/etherspoof && make clean; \
--	fi
--	rm -f *.core src/*.o $(LIB)
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
-+# @configure_input@
- 
--distclean: clean
--	if test -f test/Makefile; then \
--	    cd test && make distclean; \
--	fi
--	if test -f example/Makefile; then \
--	    cd example && make distclean; \
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004  Free Software Foundation, Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+@SET_MAKE@
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = .
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_triplet = @build@
-+host_triplet = @host@
-+target_triplet = @target@
-+DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-+	$(srcdir)/Makefile.in $(srcdir)/libnet-config.in \
-+	$(top_srcdir)/Makefile.am.common $(top_srcdir)/configure \
-+	acconfig.h config.guess config.sub install-sh ltmain.sh \
-+	missing mkinstalldirs
-+subdir = .
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
-+ configure.lineno configure.status.lineno
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/include/config.h
-+CONFIG_CLEAN_FILES = libnet-config
-+am__installdirs = "$(DESTDIR)$(bindir)"
-+binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
-+SCRIPTS = $(bin_SCRIPTS)
-+depcomp =
-+am__depfiles_maybe =
-+SOURCES =
-+DIST_SOURCES =
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+	html-recursive info-recursive install-data-recursive \
-+	install-exec-recursive install-info-recursive \
-+	install-recursive installcheck-recursive installdirs-recursive \
-+	pdf-recursive ps-recursive uninstall-info-recursive \
-+	uninstall-recursive
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+distdir = $(PACKAGE)-$(VERSION)
-+top_distdir = $(distdir)
-+am__remove_distdir = \
-+  { test ! -d $(distdir) \
-+    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-+         && rm -fr $(distdir); }; }
-+DIST_ARCHIVES = $(distdir).tar.gz
-+GZIP_ENV = --best
-+distuninstallcheck_listfiles = find . -type f -print
-+distcleancheck_listfiles = find . -type f -print
-+ACLOCAL = @ACLOCAL@
-+ADDITIONAL_LIBS = @ADDITIONAL_LIBS@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
-+AR = @AR@
-+AUTOCONF = @AUTOCONF@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
-+BIN_PREFIX = @BIN_PREFIX@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+EXEEXT = @EXEEXT@
-+INC_PREFIX = @INC_PREFIX@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+LDFLAGS = @LDFLAGS@
-+LIBNET_CONFIG_CFLAGS = @LIBNET_CONFIG_CFLAGS@
-+LIBNET_CONFIG_DEFINES = @LIBNET_CONFIG_DEFINES@
-+LIBNET_CONFIG_LIBS = @LIBNET_CONFIG_LIBS@
-+LIBOBJS = @LIBOBJS@
-+LIBS = @LIBS@
-+LIBTOOL = @LIBTOOL@
-+LIB_PREFIX = @LIB_PREFIX@
-+LL_INT_TYPE = @LL_INT_TYPE@
-+LL_INT_TYPE_UC = @LL_INT_TYPE_UC@
-+LN = @LN@
-+LN_S = @LN_S@
-+LTLIBOBJS = @LTLIBOBJS@
-+MAKEINFO = @MAKEINFO@
-+MAN_PREFIX = @MAN_PREFIX@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+RANLIB = @RANLIB@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+STRIP = @STRIP@
-+VERSION = @VERSION@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_RANLIB = @ac_ct_RANLIB@
-+ac_ct_STRIP = @ac_ct_STRIP@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
-+exec_prefix = @exec_prefix@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+oldincludedir = @oldincludedir@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+sysconfdir = @sysconfdir@
-+target = @target@
-+target_alias = @target_alias@
-+target_cpu = @target_cpu@
-+target_os = @target_os@
-+target_vendor = @target_vendor@
-+AUTOMAKE_OPTIONS = foreign no-dependencies
-+DISTCLEANFILES = *~
-+SUBDIRS = src include
-+EXTRA_DIST = Makefile.am.common
-+bin_SCRIPTS = libnet-config
-+all: all-recursive
-+
-+.SUFFIXES:
-+am--refresh:
-+	@:
-+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
-+	      cd $(srcdir) && $(AUTOMAKE) --foreign  \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  Makefile
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    echo ' $(SHELL) ./config.status'; \
-+	    $(SHELL) ./config.status;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	$(SHELL) ./config.status --recheck
-+
-+$(top_srcdir)/configure:  $(am__configure_deps)
-+	cd $(srcdir) && $(AUTOCONF)
-+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-+libnet-config: $(top_builddir)/config.status $(srcdir)/libnet-config.in
-+	cd $(top_builddir) && $(SHELL) ./config.status $@
-+install-binSCRIPTS: $(bin_SCRIPTS)
-+	@$(NORMAL_INSTALL)
-+	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
-+	@list='$(bin_SCRIPTS)'; for p in $$list; do \
-+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+	  if test -f $$d$$p; then \
-+	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-+	    echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-+	    $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \
-+	  else :; fi; \
-+	done
-+
-+uninstall-binSCRIPTS:
-+	@$(NORMAL_UNINSTALL)
-+	@list='$(bin_SCRIPTS)'; for p in $$list; do \
-+	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-+	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-+	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
-+	done
-+
-+mostlyclean-libtool:
-+	-rm -f *.lo
-+
-+clean-libtool:
-+	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
-+
-+# This directory's subdirectories are mostly independent; you can cd
-+# into them and run `make' without going through this Makefile.
-+# To change the values of `make' variables: instead of editing Makefiles,
-+# (1) if the variable is set in `config.status', edit `config.status'
-+#     (which will cause the Makefiles to be regenerated when you run `make');
-+# (2) otherwise, pass the desired values on the `make' command line.
-+$(RECURSIVE_TARGETS):
-+	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	dot_seen=no; \
-+	target=`echo $@ | sed s/-recursive//`; \
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  echo "Making $$target in $$subdir"; \
-+	  if test "$$subdir" = "."; then \
-+	    dot_seen=yes; \
-+	    local_target="$$target-am"; \
-+	  else \
-+	    local_target="$$target"; \
-+	  fi; \
-+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	done; \
-+	if test "$$dot_seen" = "no"; then \
-+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-+	fi; test -z "$$fail"
-+
-+mostlyclean-recursive clean-recursive distclean-recursive \
-+maintainer-clean-recursive:
-+	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	dot_seen=no; \
-+	case "$@" in \
-+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-+	  *) list='$(SUBDIRS)' ;; \
-+	esac; \
-+	rev=''; for subdir in $$list; do \
-+	  if test "$$subdir" = "."; then :; else \
-+	    rev="$$subdir $$rev"; \
-+	  fi; \
-+	done; \
-+	rev="$$rev ."; \
-+	target=`echo $@ | sed s/-recursive//`; \
-+	for subdir in $$rev; do \
-+	  echo "Making $$target in $$subdir"; \
-+	  if test "$$subdir" = "."; then \
-+	    local_target="$$target-am"; \
-+	  else \
-+	    local_target="$$target"; \
-+	  fi; \
-+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	done && test -z "$$fail"
-+tags-recursive:
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-+	done
-+ctags-recursive:
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-+	done
-+
-+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	mkid -fID $$unique
-+tags: TAGS
-+
-+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-+	  include_option=--etags-include; \
-+	  empty_fix=.; \
-+	else \
-+	  include_option=--include; \
-+	  empty_fix=; \
-+	fi; \
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  if test "$$subdir" = .; then :; else \
-+	    test ! -f $$subdir/TAGS || \
-+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-+	  fi; \
-+	done; \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
-+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	    $$tags $$unique; \
- 	fi
--	if test -f util/Makefile; then \
--	    cd util && make distclean; \
-+ctags: CTAGS
-+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-+	     $$tags $$unique
-+
-+GTAGS:
-+	here=`$(am__cd) $(top_builddir) && pwd` \
-+	  && cd $(top_srcdir) \
-+	  && gtags -i $(GTAGS_ARGS) $$here
-+
-+distclean-tags:
-+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-+
-+distdir: $(DISTFILES)
-+	$(am__remove_distdir)
-+	mkdir $(distdir)
-+	$(mkdir_p) $(distdir)/.
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
-+	  if test -d $$d/$$file; then \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  if test "$$subdir" = .; then :; else \
-+	    test -d "$(distdir)/$$subdir" \
-+	    || mkdir "$(distdir)/$$subdir" \
-+	    || exit 1; \
-+	    (cd $$subdir && \
-+	      $(MAKE) $(AM_MAKEFLAGS) \
-+	        top_distdir="../$(top_distdir)" \
-+	        distdir="../$(distdir)/$$subdir" \
-+	        distdir) \
-+	      || exit 1; \
-+	  fi; \
-+	done
-+	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-+	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
-+	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-+	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
-+	|| chmod -R a+r $(distdir)
-+dist-gzip: distdir
-+	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-+	$(am__remove_distdir)
-+
-+dist-bzip2: distdir
-+	$(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
-+	$(am__remove_distdir)
-+
-+dist-tarZ: distdir
-+	$(AMTAR) chof - $(distdir) | compress -c >$(distdir).tar.Z
-+	$(am__remove_distdir)
-+
-+dist-shar: distdir
-+	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-+	$(am__remove_distdir)
-+
-+dist-zip: distdir
-+	-rm -f $(distdir).zip
-+	zip -rq $(distdir).zip $(distdir)
-+	$(am__remove_distdir)
-+
-+dist dist-all: distdir
-+	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-+	$(am__remove_distdir)
-+
-+# This target untars the dist file and tries a VPATH configuration.  Then
-+# it guarantees that the distribution is self-contained by making another
-+# tarfile.
-+distcheck: dist
-+	case '$(DIST_ARCHIVES)' in \
-+	*.tar.gz*) \
-+	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ;;\
-+	*.tar.bz2*) \
-+	  bunzip2 -c $(distdir).tar.bz2 | $(AMTAR) xf - ;;\
-+	*.tar.Z*) \
-+	  uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\
-+	*.shar.gz*) \
-+	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
-+	*.zip*) \
-+	  unzip $(distdir).zip ;;\
-+	esac
-+	chmod -R a-w $(distdir); chmod a+w $(distdir)
-+	mkdir $(distdir)/_build
-+	mkdir $(distdir)/_inst
-+	chmod a-w $(distdir)
-+	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-+	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-+	  && cd $(distdir)/_build \
-+	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-+	    $(DISTCHECK_CONFIGURE_FLAGS) \
-+	  && $(MAKE) $(AM_MAKEFLAGS) \
-+	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-+	  && $(MAKE) $(AM_MAKEFLAGS) check \
-+	  && $(MAKE) $(AM_MAKEFLAGS) install \
-+	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-+	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-+	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-+	        distuninstallcheck \
-+	  && chmod -R a-w "$$dc_install_base" \
-+	  && ({ \
-+	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
-+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-+	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-+	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
-+	  && rm -rf "$$dc_destdir" \
-+	  && $(MAKE) $(AM_MAKEFLAGS) dist \
-+	  && rm -rf $(DIST_ARCHIVES) \
-+	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
-+	$(am__remove_distdir)
-+	@(echo "$(distdir) archives ready for distribution: "; \
-+	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-+	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
-+distuninstallcheck:
-+	@cd $(distuninstallcheck_dir) \
-+	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-+	   || { echo "ERROR: files left after uninstall:" ; \
-+	        if test -n "$(DESTDIR)"; then \
-+	          echo "  (check DESTDIR support)"; \
-+	        fi ; \
-+	        $(distuninstallcheck_listfiles) ; \
-+	        exit 1; } >&2
-+distcleancheck: distclean
-+	@if test '$(srcdir)' = . ; then \
-+	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-+	  exit 1 ; \
- 	fi
--	if test -f support/bpf-lkm/etherspoof; then \
--	    cd support/bpf-lkm/etherspoof && rm -rf Makefile; \
--	fi
--	rm -f config.log config.cache config.status Makefile include/config.h \
--	version.h support/bpf-lkm/etherspoof conftest* libnet-config
-+	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-+	  || { echo "ERROR: files left in build directory after distclean:" ; \
-+	       $(distcleancheck_listfiles) ; \
-+	       exit 1; } >&2
-+check-am: all-am
-+check: check-recursive
-+all-am: Makefile $(SCRIPTS)
-+installdirs: installdirs-recursive
-+installdirs-am:
-+	for dir in "$(DESTDIR)$(bindir)"; do \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	done
-+install: install-recursive
-+install-exec: install-exec-recursive
-+install-data: install-data-recursive
-+uninstall: uninstall-recursive
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-recursi