From 370410c6e4e6d24a5849765d04695090bdb5939d Mon Sep 17 00:00:00 2001 From: Bruce M Simpson Date: Thu, 22 Mar 2007 20:46:49 +0000 Subject: [PATCH] Update to new release 1.4. --- net/xorp/Makefile | 8 ++--- net/xorp/distinfo | 9 ++---- net/xorp/files/patch-configure | 16 +++++----- net/xorp/files/patch-configure-in | 6 ++-- net/xorp/files/patch-fea::pa_backend_ipfw2.cc | 29 ------------------- net/xorp/files/patch-mibs-configure | 11 ------- net/xorp/pkg-plist | 2 ++ 7 files changed, 18 insertions(+), 63 deletions(-) delete mode 100644 net/xorp/files/patch-fea::pa_backend_ipfw2.cc delete mode 100644 net/xorp/files/patch-mibs-configure diff --git a/net/xorp/Makefile b/net/xorp/Makefile index c2b3657115ff..60cc8ff540e0 100644 --- a/net/xorp/Makefile +++ b/net/xorp/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xorp -PORTVERSION= 1.3 -PORTREVISION= 2 +PORTVERSION= 1.4 CATEGORIES= net MASTER_SITES= http://www.xorp.org/releases/${PORTVERSION}/ \ http://www2.xorp.org/releases/${PORTVERSION}/ \ @@ -15,10 +14,6 @@ MASTER_SITES= http://www.xorp.org/releases/${PORTVERSION}/ \ http://www3.xorp.org/releases/${PORTVERSION}/ DISTNAME= ${PORTNAME}-${PORTVERSION} -# Patch for http://www.xorp.org/advisories/XORP_SA_06:01.ospf.txt. -PATCH_SITES= http://www.xorp.org/patches/SA-06:01/ -PATCHFILES= xorp_sa_06:01.ospf_1.3.patch:DEFAULT - MAINTAINER= bms@FreeBSD.org COMMENT= The eXtensible Open Router Platform @@ -79,6 +74,7 @@ CONFIGURE_ARGS+= --with-snmp \ --with-path-to-net-snmpd-config=${LOCALBASE}/bin/net-snmp-config \ --enable-shared PLIST_SUB+= XORP_SNMP="" +USE_LDCONFIG= ${PREFIX}/mibs .else PLIST_SUB+= XORP_SNMP="@comment " .endif diff --git a/net/xorp/distinfo b/net/xorp/distinfo index 899989360eae..6d882e19727b 100644 --- a/net/xorp/distinfo +++ b/net/xorp/distinfo @@ -1,6 +1,3 @@ -MD5 (xorp-1.3.tar.gz) = d428b0c3c7afdad32b529cce2f8b0b2b -SHA256 (xorp-1.3.tar.gz) = 4196f2d02268d732a4268924b971ff7fe9cc5425cde53ff10dd45665dcee7bbd -SIZE (xorp-1.3.tar.gz) = 8359944 -MD5 (xorp_sa_06:01.ospf_1.3.patch) = 8e4169a3aef75d716b55cefaf277cfd6 -SHA256 (xorp_sa_06:01.ospf_1.3.patch) = ed23037f353edc9f5eac8ee9ad1d05551b6e88f863de369eb3aa0f49c137eccf -SIZE (xorp_sa_06:01.ospf_1.3.patch) = 3286 +MD5 (xorp-1.4.tar.gz) = 2eeacffc96d9551fdbf6786fcd033e76 +SHA256 (xorp-1.4.tar.gz) = ec34cd5be7f0bf532fc18df148047e011279d29df025df12a3eb2cee671cab91 +SIZE (xorp-1.4.tar.gz) = 8496928 diff --git a/net/xorp/files/patch-configure b/net/xorp/files/patch-configure index 610aa17b1baf..6faa12d9efbc 100644 --- a/net/xorp/files/patch-configure +++ b/net/xorp/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Tue Jul 4 22:25:12 2006 -+++ configure Tue Jul 4 22:25:58 2006 -@@ -15438,8 +15438,6 @@ +--- configure.orig Thu Mar 22 18:47:54 2007 ++++ configure Thu Mar 22 18:47:55 2007 +@@ -19126,8 +19126,6 @@ case "${host_os}" in @@ -9,16 +9,16 @@ *) ;; esac -@@ -16135,7 +16133,7 @@ +@@ -19990,7 +19988,7 @@ + fi - --ac_config_files="$ac_config_files Makefile MakefileRootCheck bgp/Makefile bgp/harness/Makefile bgp/tools/Makefile cli/Makefile cli/tools/Makefile contrib/Makefile docs/Makefile docs/bgp/Makefile docs/design_arch/Makefile docs/fea/Makefile docs/libxipc/Makefile docs/libxorp/Makefile docs/mfea/Makefile docs/mld6igmp/Makefile docs/multicast/Makefile docs/pim/Makefile docs/pim_testsuite/Makefile docs/rib/Makefile docs/rtrmgr/Makefile docs/slides/Makefile docs/slides/status_2004_02/Makefile docs/snmp/Makefile docs/test_harness/Makefile docs/user_manual/Makefile docs/xorpdev_101/Makefile etc/Makefile etc/templates/Makefile fea/Makefile fea/MakefileRootCheck fea/tools/Makefile fib2mrib/Makefile libcomm/Makefile libfeaclient/Makefile libproto/Makefile libxipc/Makefile libxorp/Makefile mld6igmp/Makefile mrt/Makefile ospf/Makefile ospf/tools/Makefile pim/Makefile policy/Makefile policy/backend/Makefile policy/common/Makefile policy/test/Makefile rib/Makefile rib/tools/Makefile rip/Makefile rip/tools/Makefile rtrmgr/Makefile static_routes/Makefile utils/Makefile utils/flower_malloc/Makefile xrl/Makefile xrl/interfaces/Makefile xrl/targets/Makefile xrl/tests/Makefile" -+ac_config_files="$ac_config_files Makefile MakefileRootCheck bgp/Makefile bgp/harness/Makefile bgp/tools/Makefile cli/Makefile cli/tools/Makefile contrib/Makefile docs/Makefile docs/bgp/Makefile docs/design_arch/Makefile docs/fea/Makefile docs/libxipc/Makefile docs/libxorp/Makefile docs/mfea/Makefile docs/mld6igmp/Makefile docs/multicast/Makefile docs/pim/Makefile docs/pim_testsuite/Makefile docs/rib/Makefile docs/rtrmgr/Makefile docs/slides/Makefile docs/slides/status_2004_02/Makefile docs/snmp/Makefile docs/test_harness/Makefile docs/user_manual/Makefile docs/xorpdev_101/Makefile etc/Makefile etc/templates/Makefile fea/Makefile fea/MakefileRootCheck fea/tools/Makefile fib2mrib/Makefile libcomm/Makefile libfeaclient/Makefile libproto/Makefile libxipc/Makefile libxorp/Makefile mld6igmp/Makefile mrt/Makefile ospf/Makefile ospf/tools/Makefile pim/Makefile policy/Makefile policy/backend/Makefile policy/common/Makefile policy/test/Makefile rib/Makefile rib/tools/Makefile rip/Makefile rip/tools/Makefile rtrmgr/Makefile static_routes/Makefile utils/Makefile xrl/Makefile xrl/interfaces/Makefile xrl/targets/Makefile xrl/tests/Makefile" +-ac_config_files="$ac_config_files Jamrules Makefile MakefileRootCheck bgp/Makefile bgp/harness/Makefile bgp/tools/Makefile cli/Makefile cli/tools/Makefile contrib/Makefile docs/Makefile docs/bgp/Makefile docs/design_arch/Makefile docs/fea/Makefile docs/libxipc/Makefile docs/libxorp/Makefile docs/mfea/Makefile docs/mld6igmp/Makefile docs/multicast/Makefile docs/pim/Makefile docs/pim_testsuite/Makefile docs/rib/Makefile docs/rtrmgr/Makefile docs/slides/Makefile docs/slides/status_2004_02/Makefile docs/snmp/Makefile docs/test_harness/Makefile docs/user_manual/Makefile docs/xorpdev_101/Makefile etc/Makefile etc/templates/Makefile fea/Makefile fea/MakefileRootCheck fea/tools/Makefile fib2mrib/Makefile libcomm/Makefile libfeaclient/Makefile libproto/Makefile libxipc/Makefile libxorp/Makefile mld6igmp/Makefile mrt/Makefile ospf/Makefile ospf/tools/Makefile pim/Makefile policy/Makefile policy/backend/Makefile policy/common/Makefile policy/test/Makefile rib/Makefile rib/tools/Makefile rip/Makefile rip/tools/Makefile rtrmgr/Makefile static_routes/Makefile utils/Makefile utils/flower_malloc/Makefile xrl/Makefile xrl/interfaces/Makefile xrl/targets/Makefile xrl/tests/Makefile" ++ac_config_files="$ac_config_files Jamrules Makefile MakefileRootCheck bgp/Makefile bgp/harness/Makefile bgp/tools/Makefile cli/Makefile cli/tools/Makefile contrib/Makefile docs/Makefile docs/bgp/Makefile docs/design_arch/Makefile docs/fea/Makefile docs/libxipc/Makefile docs/libxorp/Makefile docs/mfea/Makefile docs/mld6igmp/Makefile docs/multicast/Makefile docs/pim/Makefile docs/pim_testsuite/Makefile docs/rib/Makefile docs/rtrmgr/Makefile docs/slides/Makefile docs/slides/status_2004_02/Makefile docs/snmp/Makefile docs/test_harness/Makefile docs/user_manual/Makefile docs/xorpdev_101/Makefile etc/Makefile etc/templates/Makefile fea/Makefile fea/MakefileRootCheck fea/tools/Makefile fib2mrib/Makefile libcomm/Makefile libfeaclient/Makefile libproto/Makefile libxipc/Makefile libxorp/Makefile mld6igmp/Makefile mrt/Makefile ospf/Makefile ospf/tools/Makefile pim/Makefile policy/Makefile policy/backend/Makefile policy/common/Makefile policy/test/Makefile rib/Makefile rib/tools/Makefile rip/Makefile rip/tools/Makefile rtrmgr/Makefile static_routes/Makefile utils/Makefile xrl/Makefile xrl/interfaces/Makefile xrl/targets/Makefile xrl/tests/Makefile" ac_config_commands="$ac_config_commands default" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure -@@ -16673,7 +16671,6 @@ +@@ -20529,7 +20527,6 @@ "rtrmgr/Makefile" ) CONFIG_FILES="$CONFIG_FILES rtrmgr/Makefile" ;; "static_routes/Makefile" ) CONFIG_FILES="$CONFIG_FILES static_routes/Makefile" ;; "utils/Makefile" ) CONFIG_FILES="$CONFIG_FILES utils/Makefile" ;; diff --git a/net/xorp/files/patch-configure-in b/net/xorp/files/patch-configure-in index 75b3a1ca5776..80ef3607bc86 100644 --- a/net/xorp/files/patch-configure-in +++ b/net/xorp/files/patch-configure-in @@ -1,6 +1,6 @@ ---- configure.in.orig Tue Jul 4 22:25:21 2006 -+++ configure.in Tue Jul 4 22:26:40 2006 -@@ -807,14 +807,9 @@ +--- configure.in.orig Wed Mar 14 18:59:04 2007 ++++ configure.in Thu Mar 22 18:44:37 2007 +@@ -831,14 +831,9 @@ dnl utils/flower_malloc related dnl --------------------------------------------------------------------------- diff --git a/net/xorp/files/patch-fea::pa_backend_ipfw2.cc b/net/xorp/files/patch-fea::pa_backend_ipfw2.cc deleted file mode 100644 index 69fb6a87a96f..000000000000 --- a/net/xorp/files/patch-fea::pa_backend_ipfw2.cc +++ /dev/null @@ -1,29 +0,0 @@ ---- fea/pa_backend_ipfw2.cc.orig Wed Jan 10 20:08:58 2007 -+++ fea/pa_backend_ipfw2.cc Wed Jan 10 20:18:04 2007 -@@ -329,7 +329,7 @@ - cmds |= (CMD_MOVE_RULESET << 24); - cmds |= ((dst_index << 16) & 0xFF); - cmds |= src_index & 0xFFFF; -- return (docmd4(IP_FW_DEL, (void*)cmds, sizeof(cmds))); -+ return (docmd4(IP_FW_DEL, (void*)(uintptr_t)cmds, sizeof(cmds))); - } - - // Swap the contents of the two rulesets. -@@ -344,7 +344,7 @@ - cmds |= (CMD_SWAP_RULESETS << 24); - cmds |= ((first_index << 16) & 0xFF); - cmds |= second_index & 0xFFFF; -- return (docmd4(IP_FW_DEL, (void*)cmds, sizeof(cmds))); -+ return (docmd4(IP_FW_DEL, (void*)(uintptr_t)cmds, sizeof(cmds))); - } - - // Flush the contents of a given ruleset. -@@ -355,7 +355,7 @@ - uint32_t cmds = 0; - cmds |= (CMD_DEL_RULES_WITH_SET << 24); - cmds |= index & 0xFFFF; -- return (docmd4(IP_FW_DEL, (void*)cmds, sizeof(cmds))); -+ return (docmd4(IP_FW_DEL, (void*)(uintptr_t)cmds, sizeof(cmds))); - } - - // Micro-assemble an IPFW2 instruction sequence for the specified diff --git a/net/xorp/files/patch-mibs-configure b/net/xorp/files/patch-mibs-configure deleted file mode 100644 index 6e0f018ce1d4..000000000000 --- a/net/xorp/files/patch-mibs-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- mibs/configure.orig Tue Jul 4 16:53:56 2006 -+++ mibs/configure Tue Jul 4 16:54:09 2006 -@@ -5003,7 +5003,7 @@ - # MIB support. dummy MIB modules will only generate warnings - echo 'dlmod dummy doubledummy' > conftestsnmp.conf - test_ports='51510 51520 51530 51540 51550' -- snmpd_base_args="-f -r -l conftestsnmp.log -c conftestsnmp.conf" -+ snmpd_base_args="-f -r -Lf conftestsnmp.log -c conftestsnmp.conf" - # On Linux snmpd seems to need the "-p" flag. - for args in "" "-p" - do diff --git a/net/xorp/pkg-plist b/net/xorp/pkg-plist index bc643a824024..1053145faf2f 100644 --- a/net/xorp/pkg-plist +++ b/net/xorp/pkg-plist @@ -25,6 +25,8 @@ etc/templates/mld.cmds etc/templates/mld.tp etc/templates/ospfv2.cmds etc/templates/ospfv2.tp +etc/templates/ospfv3.cmds +etc/templates/ospfv3.tp etc/templates/pim.cmds etc/templates/pim6.cmds etc/templates/rib.tp