cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 1.6

Browse Source
This commit is contained in:
sthen 2009-01-15 10:14:19 +00:00
parent fc3ec71f12
commit 98207d730a
8 changed files with 92 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
net/xorp/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.12 2008/01/04 18:38:51 espie Exp $
# $OpenBSD: Makefile,v 1.13 2009/01/15 10:14:19 sthen Exp $
COMMENT-main= eXtensible Open Router Platform
VERSION= 1.4
VERSION= 1.6
DISTNAME= xorp-${VERSION}
PKGNAME-main= ${DISTNAME}p1
PKGNAME-main= ${DISTNAME}
CATEGORIES= net
HOMEPAGE= http://www.xorp.org/
@ -22,7 +22,7 @@ MULTI_PACKAGES= -main
PREFIX= ${LOCALBASE}/xorp
PREFIX-main= ${LOCALBASE}
WANTLIB= c crypto curses m stdc++
WANTLIB= c crypto curses m pcap stdc++
# No BUILD_DEPENDS:
# Python only used to rebuild already included file with no changes.
@ -36,12 +36,17 @@ CONFIGURE_ARGS= --enable-optimize --disable-debug
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/config ${WRKSRC}/cli/libtecla
REGRESS_DEPENDS= ::shells/bash \
::lang/python/2.4
::lang/python/2.5
# some regression tests must be run as root
do-regress:
@ln -s ${LOCALBASE}/bin/python2.4 ${WRKDIR}/bin
@ln -s ${LOCALBASE}/bin/python2.5 ${WRKDIR}/bin/python
@cd ${WRKBUILD}; ${SUDO} ${SETENV} ${MAKE_ENV} \
${MAKE_PROGRAM} ${ALL_REGRESS_FLAGS} ${REGRESS_TARGET}
post-install:
${INSTALL_DATA_DIR} ${WRKINST}/${PREFIX-main}/share/examples/xorp
cd ${WRKSRC}/rtrmgr/config; ${INSTALL_DATA} README *.boot \
${WRKINST}/${PREFIX-main}/share/examples/xorp
.include <bsd.port.mk>

10
net/xorp/distinfo
View File

@ -1,5 +1,5 @@
MD5 (xorp-1.4.tar.gz) = LurP/JbZVR/b9nhvzQM+dg==
RMD160 (xorp-1.4.tar.gz) = TrvFBtUumWvxX0PA3xlgzv0NuvY=
SHA1 (xorp-1.4.tar.gz) = KPJ6siDdtXGiRBQ8h9GGhdciZu4=
SHA256 (xorp-1.4.tar.gz) = 7DTNW+fwv1MvwY3xSAR+ARJ50p3wJd8So+ss7mccq5E=
SIZE (xorp-1.4.tar.gz) = 8496928
MD5 (xorp-1.6.tar.gz) = AatYaPVI0Nbkh2lFrL2Iuw==
RMD160 (xorp-1.6.tar.gz) = MrP20D3vyBbtmDCI5htegI3hf5g=
SHA1 (xorp-1.6.tar.gz) = Nm0yBo7Xa47GmVi2AdT73mHvTLs=
SHA256 (xorp-1.6.tar.gz) = 0/r/VvXljPQ/owDhTWtXAuqedRR/PS0qrkTai9o/j4I=
SIZE (xorp-1.6.tar.gz) = 7895108

12
net/xorp/patches/patch-cli_libtecla_Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-cli_libtecla_Makefile_in,v 1.2 2006/10/18 23:18:02 naddy Exp $
--- cli/libtecla/Makefile.in.orig Mon Jan 9 21:30:25 2006
+++ cli/libtecla/Makefile.in Wed Oct 18 18:09:42 2006
@@ -85,7 +85,7 @@ DEFINES_R = -D_POSIX_C_SOURCE=200112L
# on modifying the library, leave this set to -O.
#
-OPT = -O
+OPT =
#
# These are paranoid gcc warning flags to use when compiling new code.

12
net/xorp/patches/patch-fea_Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-fea_Makefile_in,v 1.1 2007/03/25 21:50:20 naddy Exp $
--- fea/Makefile.in.orig Sun Mar 25 17:13:54 2007
+++ fea/Makefile.in Sun Mar 25 17:14:58 2007
@@ -760,6 +760,8 @@ distclean-depend:
@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
$(LTCXXCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
+mfea_proto_comm.lo rawsock.lo: CXXFLAGS := $(filter-out -Wcast-align,$(CXXFLAGS))
+
xorp_fea_dummy-fea.o: fea.cc
@AMDEP_TRUE@ source='fea.cc' object='xorp_fea_dummy-fea.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@ depfile='$(DEPDIR)/xorp_fea_dummy-fea.Po' tmpdepfile='$(DEPDIR)/xorp_fea_dummy-fea.TPo' @AMDEPBACKSLASH@

12
net/xorp/patches/patch-fea_data_plane_io_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-fea_data_plane_io_Makefile_in,v 1.1 2009/01/15 10:14:19 sthen Exp $
--- fea/data_plane/io/Makefile.in.orig Tue Jan 13 11:53:23 2009
+++ fea/data_plane/io/Makefile.in Tue Jan 13 11:53:12 2009
@@ -299,6 +299,8 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+io_ip_socket.lo io_tcpudp_socket.lo: CXXFLAGS := $(filter-out -Wcast-align,$(CXXFLAGS))
+
mostlyclean-libtool:
-rm -f *.lo

13
net/xorp/patches/patch-fea_ifconfig_media_cc
View File

@ -1,13 +0,0 @@
$OpenBSD: patch-fea_ifconfig_media_cc,v 1.1 2007/06/09 16:45:50 naddy Exp $
--- fea/ifconfig_media.cc.orig Fri Jun 8 00:04:20 2007
+++ fea/ifconfig_media.cc Fri Jun 8 00:04:52 2007
@@ -95,7 +95,9 @@ ifconfig_media_get_link_status(const string& if_name,
switch (IFM_TYPE(ifmr.ifm_active)) {
case IFM_ETHER:
case IFM_FDDI:
+#if defined(IFM_TOKEN)
case IFM_TOKEN:
+#endif
case IFM_IEEE80211:
if ((ifmr.ifm_status & IFM_AVALID)
&& (ifmr.ifm_status & IFM_ACTIVE)) {

2
net/xorp/pkg/DESCR-main
View File

@ -10,5 +10,7 @@ Currently, XORP implements the following protocols:
* PIM-SM
* IGMP v1, v2, and v3
* MLD v1 and v2
* OLSR
* VRRP
For documentation, see the XORP home page.

95
net/xorp/pkg/PLIST-main
View File

@ -1,19 +1,39 @@
@comment $OpenBSD: PLIST-main,v 1.2 2007/03/22 17:19:09 naddy Exp $
@comment $OpenBSD: PLIST-main,v 1.3 2009/01/15 10:14:19 sthen Exp $
@pkgpath net/xorp
share/examples/xorp/
share/examples/xorp/README
share/examples/xorp/bgp.boot
share/examples/xorp/click.boot
share/examples/xorp/interfaces.boot
share/examples/xorp/multicast4.boot
share/examples/xorp/multicast6.boot
share/examples/xorp/ospfv2.boot
share/examples/xorp/ospfv3.boot
share/examples/xorp/rip.boot
share/examples/xorp/ripng.boot
share/examples/xorp/snmp.boot
share/examples/xorp/static.boot
xorp/
xorp/bgp/
xorp/bgp/tools/
xorp/bgp/tools/xorpsh_print_peers
xorp/bgp/tools/xorpsh_print_routes
xorp/bgp/xorp_bgp
@bin xorp/bgp/tools/xorpsh_print_peers
@bin xorp/bgp/tools/xorpsh_print_routes
@bin xorp/bgp/xorp_bgp
xorp/bin/
xorp/bin/call_xrl
xorp/bin/xorp_profiler
xorp/bin/xorp_rtrmgr
xorp/bin/xorpsh
@bin xorp/bin/call_xrl
@bin xorp/bin/xorp_profiler
@bin xorp/bin/xorp_rtrmgr
@bin xorp/bin/xorpsh
xorp/cli/
xorp/cli/tools/
xorp/cli/tools/send_cli_processor_xrl
@bin xorp/cli/tools/cli_generic
@bin xorp/cli/tools/send_cli_processor_xrl
xorp/contrib/
xorp/contrib/olsr/
xorp/contrib/olsr/tools/
@bin xorp/contrib/olsr/tools/clear_database
@bin xorp/contrib/olsr/tools/print_databases
@bin xorp/contrib/olsr/xorp_olsr4
xorp/etc/
xorp/etc/templates/
xorp/etc/templates/bgp.cmds
@ -21,6 +41,7 @@ xorp/etc/templates/bgp.tp
xorp/etc/templates/fea.cmds
xorp/etc/templates/fea.tp
xorp/etc/templates/fib2mrib.tp
xorp/etc/templates/firewall.tp
xorp/etc/templates/host.cmds
xorp/etc/templates/igmp.cmds
xorp/etc/templates/igmp.tp
@ -32,6 +53,8 @@ xorp/etc/templates/mfea6.tp
xorp/etc/templates/misc.cmds
xorp/etc/templates/mld.cmds
xorp/etc/templates/mld.tp
xorp/etc/templates/olsr4.cmds
xorp/etc/templates/olsr4.tp
xorp/etc/templates/ospfv2.cmds
xorp/etc/templates/ospfv2.tp
xorp/etc/templates/ospfv3.cmds
@ -47,6 +70,7 @@ xorp/etc/templates/rib.cmds
xorp/etc/templates/rib.tp
xorp/etc/templates/rip.cmds
xorp/etc/templates/rip.tp
xorp/etc/templates/ripng.cmds
xorp/etc/templates/ripng.tp
xorp/etc/templates/rtrmgr.tp
xorp/etc/templates/snmp.tp
@ -54,47 +78,50 @@ xorp/etc/templates/static_routes.tp
xorp/etc/templates/xorpsh.cmds
xorp/fea/
xorp/fea/tools/
xorp/fea/tools/show_interfaces
xorp/fea/xorp_fea
@bin xorp/fea/tools/show_interfaces
@bin xorp/fea/xorp_fea
xorp/fea/xorp_fea_click_config_generator
xorp/fea/xorp_fea_dummy
@bin xorp/fea/xorp_fea_dummy
xorp/fib2mrib/
xorp/fib2mrib/xorp_fib2mrib
@bin xorp/fib2mrib/xorp_fib2mrib
xorp/libxipc/
xorp/libxipc/xorp_finder
@bin xorp/libxipc/xorp_finder
xorp/mld6igmp/
xorp/mld6igmp/xorp_igmp
xorp/mld6igmp/xorp_mld
@bin xorp/mld6igmp/xorp_igmp
@bin xorp/mld6igmp/xorp_mld
xorp/ospf/
xorp/ospf/tools/
xorp/ospf/tools/print_lsas
xorp/ospf/tools/print_neighbours
xorp/ospf/xorp_ospfv2
xorp/ospf/xorp_ospfv3
@bin xorp/ospf/tools/clear_database
@bin xorp/ospf/tools/print_lsas
@bin xorp/ospf/tools/print_neighbours
@bin xorp/ospf/xorp_ospfv2
@bin xorp/ospf/xorp_ospfv3
xorp/pim/
xorp/pim/xorp_pimsm4
xorp/pim/xorp_pimsm6
@bin xorp/pim/xorp_pimsm4
@bin xorp/pim/xorp_pimsm6
xorp/policy/
xorp/policy/xorp_policy
@bin xorp/policy/xorp_policy
xorp/rib/
xorp/rib/tools/
xorp/rib/tools/show_routes
xorp/rib/xorp_rib
@bin xorp/rib/tools/show_distances
@bin xorp/rib/tools/show_routes
@bin xorp/rib/xorp_rib
xorp/rip/
xorp/rip/tools/
xorp/rip/tools/show_peer_stats
xorp/rip/tools/show_stats
xorp/rip/xorp_rip
xorp/rip/xorp_ripng
@bin xorp/rip/tools/show_peer_stats
@bin xorp/rip/tools/show_stats
@bin xorp/rip/xorp_rip
@bin xorp/rip/xorp_ripng
xorp/static_routes/
xorp/static_routes/xorp_static_routes
@bin xorp/static_routes/xorp_static_routes
xorp/vrrp/
@bin xorp/vrrp/xorp_vrrp
xorp/xrl/
xorp/xrl/targets/
xorp/xrl/targets/bgp.xrls
xorp/xrl/targets/bgp4_mib.xrls
xorp/xrl/targets/cli.xrls
xorp/xrl/targets/coord.xrls
xorp/xrl/targets/demo_fea_ifmgr_client.xrls
xorp/xrl/targets/fea.xrls
xorp/xrl/targets/fea_ifmgr_mirror.xrls
xorp/xrl/targets/fib2mrib.xrls
@ -102,9 +129,9 @@ xorp/xrl/targets/finder.xrls
xorp/xrl/targets/finder_client.xrls
xorp/xrl/targets/mfea.xrls
xorp/xrl/targets/mld6igmp.xrls
xorp/xrl/targets/olsr4.xrls
xorp/xrl/targets/ospfv2.xrls
xorp/xrl/targets/ospfv3.xrls
xorp/xrl/targets/packet_acl.xrls
xorp/xrl/targets/pim.xrls
xorp/xrl/targets/policy.xrls
xorp/xrl/targets/profiler.xrls
@ -113,15 +140,17 @@ xorp/xrl/targets/ribclient.xrls
xorp/xrl/targets/rip.xrls
xorp/xrl/targets/ripng.xrls
xorp/xrl/targets/rtrmgr.xrls
xorp/xrl/targets/show_distances.xrls
xorp/xrl/targets/show_routes.xrls
xorp/xrl/targets/socket_server.xrls
xorp/xrl/targets/static_routes.xrls
xorp/xrl/targets/test.xrls
xorp/xrl/targets/test_fea_ifmgr_mirror.xrls
xorp/xrl/targets/test_fea_rawlink.xrls
xorp/xrl/targets/test_finder_events.xrls
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