Update xorp to 1.6, as requested by PR 41115.

Release 1.6 (1/07/2009)
============================
  ALL:
    - XORP now builds on Linux CentOS 5.2, Linux openSUSE-11.0,
      Linux Debian-5.0 (lenny, unreleased), Linux Ubuntu 8.10,
      Linux Red Hat Enterprise Linux Server release 5 (Tikanga),
      Linux Fedora 10, and OpenBSD-4.4.

    - XORP now builds on Linux systems with kernel 2.6.26 which is the
      first one to support IPv6 multicast routing.

  CONFIGURATION:
    - If a PIM-SM router is suppose to receive and process the PIM-SM
      Bootstrap messages, the configuration must have the "bootstrap {}"
      block included (even if it is empty):

      protocols {
          pimsm4 {
              bootstrap {
              }
          }
      }

      protocols {
          pimsm6 {
              bootstrap {
              }
          }
      }

      Previously, the Bootstrap messages were unconditionally processed
      even if the "bootstrap {}" block contained "disable: true"
      statement.

    - The following CLI operational command prefix has been changed:
      OLD: "show route admin distances"
      NEW: "show route admin distance"

    - The CLI "show version" command is supported

    - Addition of run-time configuration trace options for RIP/RIPng:

      protocols {
          rip {
              traceoptions {
                  disable: false
              }
          }
      }

  LIBXORP:
    - Class EtherMac is removed and is replaced/superseded by the
      existing class Mac.

    - Performance improvements and various bug fixes in the EventLoop
      and SelectorList implementation.

  LIBXIPC:
    - XRL performance enhancements. (Bug 808)

    - Issues that might be triggered under heavy system load have been fixed
      (Bug 800)

  LIBFEACLIENT:
    - No significant changes.

  XRL:
    - See LIBXIPC

  RTRMGR:
    - No significant changes.

  XORPSH:
    - Incorrect help "show bgp peers detail" command  (Bug 280)

    - Xorpsh exiting immediately on error doesn't work  (Bug 763)

    - "Show version" CLI supported  (Bug 789)

    -  Show route admin distance not working (Bug 812)

  POLICY:
    - Tag per route is not reset in case the policies are removed (Bug 567)

    - Implement per-peer BGP import/export policies  (Bug 667)

    - Enhance policy network-lists to included prefix length (Bug 674)

  FEA/MFEA:
    - Bug fix for OpenBSD when transmitting IGMP packets.

  RIB:
    - No significant changes

  RIP/RIPng:
    - Added traceoption support

  OLSR:
    -

  OSPF:
    - When the designated router was restarted the MaxAge LSAs that it
      generated when reflected back would be responded to with a MaxAge LSA,
      this process could continue indefinitely, leaving the neighbor state in
      EXCHANGE. (Bug 785)

    - OSPF virtual links support broken in the 1.5 and 1.6 releases

  BGP:
    - Support for Red Hat Linux (Bug 793)

  STATIC_ROUTES:
    - No significant changes.

  MLD/IGMP:
    - Bug fix when checking the source address of IGMP packet if the
      source address is allowed to be 0.0.0.0.

  MLD/IGMP-Lite:
    - Bug fix when checking the source address of IGMP packet if the
      source address is allowed to be 0.0.0.0.

  PIM-SM:
      Ability to add candidate BSR after inserting Cand-RP with same group
      (Bug 803)

  FIB2MRIB:
    - No significant changes.


  SNMP:
    -

  VRRP:
    - Initial implementation of VRRP version 2 as described in RFC 3768.

    - Supports running more than one VRRP instances on the same box although
      they need to be on different interfaces and different LANs for correct
      behavior (see ERRATA).

    - The following master failure modes have been tested and are known to work
      (i.e., backup becomes master): bringing the master's interface down,
      rebooting / crashing the master, physically removing the network cable.
      Note that in the latter case the master may fail to resume operations
      when the cable is restored (see ERRATA).

    - Successfully interoperates with vrrpd.

6 files changed, 27 insertions, 23 deletions

diff --git a/net/xorp/Makefile b/net/xorp/Makefile
index 1c593cf6461..6cf9d9631b9 100644
--- a/net/xorp/Makefile
+++ b/net/xorp/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2008/09/11 10:59:03 obache Exp $
+# $NetBSD: Makefile,v 1.23 2009/05/12 13:58:44 obache Exp $
 #
 
-DISTNAME=		xorp-1.5
+DISTNAME=		xorp-1.6
 CATEGORIES=		net
-MASTER_SITES=		http://www.xorp.org/releases/1.5/
+MASTER_SITES=		http://www.xorp.org/releases/1.6/
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.xorp.org/
diff --git a/net/xorp/PLIST b/net/xorp/PLIST
index 7b10640206a..5ce0c644add 100644
--- a/net/xorp/PLIST
+++ b/net/xorp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2008/09/11 10:59:03 obache Exp $
+@comment $NetBSD: PLIST,v 1.6 2009/05/12 13:58:44 obache Exp $
 xorp/bgp/tools/xorpsh_print_peers
 xorp/bgp/tools/xorpsh_print_routes
 xorp/bgp/xorp_bgp
@@ -6,6 +6,7 @@ xorp/bin/call_xrl
 xorp/bin/xorp_profiler
 xorp/bin/xorp_rtrmgr
 xorp/bin/xorpsh
+xorp/cli/tools/cli_generic
 xorp/cli/tools/send_cli_processor_xrl
 xorp/contrib/olsr/tools/clear_database
 xorp/contrib/olsr/tools/print_databases
@@ -74,6 +75,7 @@ xorp/rip/tools/show_stats
 xorp/rip/xorp_rip
 xorp/rip/xorp_ripng
 xorp/static_routes/xorp_static_routes
+xorp/vrrp/xorp_vrrp
 xorp/xrl/targets/bgp.xrls
 xorp/xrl/targets/bgp4_mib.xrls
 xorp/xrl/targets/cli.xrls
@@ -107,10 +109,12 @@ xorp/xrl/targets/test_peer.xrls
 xorp/xrl/targets/test_socket4.xrls
 xorp/xrl/targets/test_socket6.xrls
 xorp/xrl/targets/test_xrls.xrls
+xorp/xrl/targets/vrrp.xrls
 xorp/xrl/targets/xorp_if_mib.xrls
 xorp/xrl/targets/xorpsh.xrls
 @dirrm xorp/xrl/targets
 @dirrm xorp/xrl
+@dirrm xorp/vrrp
 @dirrm xorp/static_routes
 @dirrm xorp/rip/tools
 @dirrm xorp/rip
diff --git a/net/xorp/distinfo b/net/xorp/distinfo
index 725fc655465..5455444c97c 100644
--- a/net/xorp/distinfo
+++ b/net/xorp/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.15 2009/02/07 18:39:20 joerg Exp $
+$NetBSD: distinfo,v 1.16 2009/05/12 13:58:44 obache Exp $
 
-SHA1 (xorp-1.5.tar.gz) = cc6a0ec42d5dd49b57b9dab365a247c646d5e843
-RMD160 (xorp-1.5.tar.gz) = 4dd5cc7162a0f8087ed973b45279718ea2a337b8
-Size (xorp-1.5.tar.gz) = 7384564 bytes
-SHA1 (patch-aa) = b4d698f072cfc6f822716ef3193cb43f6f282f7c
-SHA1 (patch-ab) = 87ccbf0370386e50b3b5a3bd78e1ed66d4ebdba2
-SHA1 (patch-ac) = ebf26bd28368b50633c900c3041d15e2853eb57e
+SHA1 (xorp-1.6.tar.gz) = 366d32068ed76b8ec69958b601d4fbde61ef4cbb
+RMD160 (xorp-1.6.tar.gz) = 32b3f6d03defc816ed983088e61b5e808de17f98
+Size (xorp-1.6.tar.gz) = 7895108 bytes
+SHA1 (patch-aa) = 0c4bceca2560e963885069eaa7e868676c856694
+SHA1 (patch-ab) = 248719bb3ffc5fa92a2fd6a5cc63c0f77ba8d5b6
+SHA1 (patch-ac) = 87710604d945b8a58cdabeb08dbd5c484f2ad3ba
diff --git a/net/xorp/patches/patch-aa b/net/xorp/patches/patch-aa
index 535d2abe0f3..b5e596b0a06 100644
--- a/net/xorp/patches/patch-aa
+++ b/net/xorp/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2008/10/02 13:13:05 joerg Exp $
+$NetBSD: patch-aa,v 1.7 2009/05/12 13:58:44 obache Exp $
 
---- libxipc/sockutil.cc.orig	2008-09-30 15:19:41.000000000 +0200
+--- libxipc/sockutil.cc.orig	2009-01-05 18:30:56.000000000 +0000
 +++ libxipc/sockutil.cc
-@@ -299,13 +299,13 @@ get_active_ipv4_addrs(vector<IPv4>& addr
+@@ -305,13 +305,13 @@ get_active_ipv4_addrs(vector<IPv4>& addr
      for ( ; ; ) {
  	ifconf.ifc_len = ifnum * sizeof(struct ifreq);
  	if (ifconf.ifc_buf != NULL)
@@ -19,7 +19,7 @@ $NetBSD: patch-aa,v 1.6 2008/10/02 13:13:05 joerg Exp $
  		comm_close(s);
  		return;
  	    }
-@@ -322,7 +322,7 @@ get_active_ipv4_addrs(vector<IPv4>& addr
+@@ -328,7 +328,7 @@ get_active_ipv4_addrs(vector<IPv4>& addr
      //
      vector<uint8_t> buffer(ifconf.ifc_len);
      memcpy(&buffer[0], ifconf.ifc_buf, ifconf.ifc_len);
diff --git a/net/xorp/patches/patch-ab b/net/xorp/patches/patch-ab
index 3306239b85e..f81afbddb00 100644
--- a/net/xorp/patches/patch-ab
+++ b/net/xorp/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.8 2009/02/07 18:39:20 joerg Exp $
+$NetBSD: patch-ab,v 1.9 2009/05/12 13:58:44 obache Exp $
 
---- fea/data_plane/control_socket/click_socket.cc.orig	2008-07-23 07:10:15.000000000 +0200
+--- fea/data_plane/control_socket/click_socket.cc.orig	2009-01-05 18:30:51.000000000 +0000
 +++ fea/data_plane/control_socket/click_socket.cc
-@@ -731,7 +731,10 @@ ClickSocket::mount_click_file_system(str
+@@ -736,7 +736,10 @@ ClickSocket::mount_click_file_system(str
  #ifdef HOST_OS_LINUX
      ret_value = mount("none", _kernel_click_mount_directory.c_str(),
  		      CLICK_FILE_SYSTEM_TYPE.c_str(), 0, 0);
diff --git a/net/xorp/patches/patch-ac b/net/xorp/patches/patch-ac
index 61dd51efb89..f5aafcbed33 100644
--- a/net/xorp/patches/patch-ac
+++ b/net/xorp/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.4 2008/10/02 13:13:05 joerg Exp $
+$NetBSD: patch-ac,v 1.5 2009/05/12 13:58:44 obache Exp $
 
---- fea/data_plane/ifconfig/ifconfig_get_ioctl.cc.orig	2008-09-30 15:53:56.000000000 +0200
+--- fea/data_plane/ifconfig/ifconfig_get_ioctl.cc.orig	2009-01-05 18:30:53.000000000 +0000
 +++ fea/data_plane/ifconfig/ifconfig_get_ioctl.cc
-@@ -154,7 +154,7 @@ IfConfigGetIoctl::read_config(IfTree& if
+@@ -159,7 +159,7 @@ IfConfigGetIoctl::read_config(IfTree& if
  	    return (XORP_ERROR);
  	vector<uint8_t> buffer(ifconf.ifc_len);
  	memcpy(&buffer[0], ifconf.ifc_buf, ifconf.ifc_len);
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.4 2008/10/02 13:13:05 joerg Exp $
  
  	parse_buffer_ioctl(ifconfig(), iftree, AF_INET, buffer);
      }
-@@ -168,7 +168,7 @@ IfConfigGetIoctl::read_config(IfTree& if
+@@ -173,7 +173,7 @@ IfConfigGetIoctl::read_config(IfTree& if
  	    return (XORP_ERROR);
  	vector<uint8_t> buffer(ifconf.ifc_len);
  	memcpy(&buffer[0], ifconf.ifc_buf, ifconf.ifc_len);
@@ -20,7 +20,7 @@ $NetBSD: patch-ac,v 1.4 2008/10/02 13:13:05 joerg Exp $
  
  	parse_buffer_ioctl(ifconfig(), iftree, AF_INET6, buffer);
      }
-@@ -204,13 +204,13 @@ ioctl_read_ifconf(int family, ifconf *if
+@@ -209,13 +209,13 @@ ioctl_read_ifconf(int family, ifconf *if
      for ( ; ; ) {
  	ifconf->ifc_len = ifnum * sizeof(struct ifreq);
  	if (ifconf->ifc_buf != NULL)