On 2008/07/23 16:09, Bruce M Simpson wrote:
> Hi!
>
> We have just released XORP 1.5, so I would be most grateful if whomever
> is the OpenBSD port maintainer could update the port.
Thanks for the notice of the update. There's no specific maintainer
for this port, but I've had a look (so far only at the port and test
suite, not actually tried using it). I had fairly good luck on i386
(no regressions) but when I ran tests on amd64 a couple of times,
the first time bgp/harness/test_peering1.sh gave no output and sat
there (left several hours),
gmake[3]: Leaving directory `/usr/obj/ports/xorp-1.5/xorp-1.5/bgp/harness'
gmake check-TESTS
gmake[3]: Entering directory `/usr/obj/ports/xorp-1.5/xorp-1.5/bgp/harness'
Entering ./test_peering1.sh -l -t test1
[hang]
Clean + rebuild + try again, the next time test_peering1.sh test1
passes ("Tests Succeeded), and then test_peering1.sh test2 hangs
(I left it ~24h that time). At this point I see these processes
running.
12767 root 2 0 1144K 3172K sleep/0 select 0:00 0.00%
../../libxipc/xorp_finder
3013 root 2 0 5540K 6072K sleep/0 select 0:00 0.00%
../../fea/xorp_fea_dummy
10734 root 2 0 3808K 5324K sleep/0 select 0:00 0.00%
../../rib/xorp_rib
12283 root 2 0 4516K 5988K sleep/0 select 0:00 0.00% ../xorp_bgp
I'm not sure how much time I can spend looking at this now, so
here's the port diff so far in case someone else wants to look at
it... If you want to test things but only have OpenBSD 4.3 easily
available, remove all "@bin " markers from pkg/PLIST-main.
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/xorp/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile 4 Jan 2008 18:38:51 -0000 1.12
+++ Makefile 24 Jul 2008 23:09:14 -0000
@@ -2,9 +2,8 @@
COMMENT-main= eXtensible Open Router Platform
-VERSION= 1.4
+VERSION= 1.5
DISTNAME= xorp-${VERSION}
-PKGNAME-main= ${DISTNAME}p1
CATEGORIES= net
HOMEPAGE= http://www.xorp.org/
@@ -36,12 +35,14 @@ CONFIGURE_ARGS= --enable-optimize --disa
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} \
+ PYTHON=${LOCALBASE}/bin/python2.5 \
${MAKE_PROGRAM} ${ALL_REGRESS_FLAGS} ${REGRESS_TARGET}
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/xorp/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 5 Apr 2007 16:20:17 -0000 1.5
+++ distinfo 24 Jul 2008 23:09:14 -0000
@@ -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.5.tar.gz) = ReejjkBvj6EVmGAQvAN6GQ==
+RMD160 (xorp-1.5.tar.gz) = TdXMcWKg+Ah+2XO0UnlxjqKjN7g=
+SHA1 (xorp-1.5.tar.gz) = zGoOxC1d1JtXudqzZaJHxkbV6EM=
+SHA256 (xorp-1.5.tar.gz) = RoWZv/SGiMUFXcET2nWhsL3yFDT4eJBv7W2lDJsbNyU=
+SIZE (xorp-1.5.tar.gz) = 7384564
Index: patches/patch-cli_libtecla_Makefile_in
===================================================================
RCS file: patches/patch-cli_libtecla_Makefile_in
diff -N patches/patch-cli_libtecla_Makefile_in
--- patches/patch-cli_libtecla_Makefile_in 18 Oct 2006 23:18:02 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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.
Index: patches/patch-fea_Makefile_in
===================================================================
RCS file: patches/patch-fea_Makefile_in
diff -N patches/patch-fea_Makefile_in
--- patches/patch-fea_Makefile_in 25 Mar 2007 21:50:20 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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@
Index: patches/patch-fea_ifconfig_media_cc
===================================================================
RCS file: patches/patch-fea_ifconfig_media_cc
diff -N patches/patch-fea_ifconfig_media_cc
--- patches/patch-fea_ifconfig_media_cc 9 Jun 2007 16:45:50 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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)) {
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/net/xorp/pkg/PLIST-main,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-main
--- pkg/PLIST-main 22 Mar 2007 17:19:09 -0000 1.2
+++ pkg/PLIST-main 24 Jul 2008 23:09:14 -0000
@@ -3,17 +3,23 @@
xorp/
xorp/bgp/
xorp/bgp/tools/
-xorp/bgp/tools/xorpsh_print_peers
-xorp/bgp/tools/xorpsh_print_routes
-xorp/bgp/xorp_bgp
[EMAIL PROTECTED] xorp/bgp/tools/xorpsh_print_peers
[EMAIL PROTECTED] xorp/bgp/tools/xorpsh_print_routes
[EMAIL PROTECTED] xorp/bgp/xorp_bgp
xorp/bin/
-xorp/bin/call_xrl
-xorp/bin/xorp_profiler
-xorp/bin/xorp_rtrmgr
-xorp/bin/xorpsh
[EMAIL PROTECTED] xorp/bin/call_xrl
[EMAIL PROTECTED] xorp/bin/xorp_profiler
[EMAIL PROTECTED] xorp/bin/xorp_rtrmgr
[EMAIL PROTECTED] xorp/bin/xorpsh
xorp/cli/
xorp/cli/tools/
-xorp/cli/tools/send_cli_processor_xrl
[EMAIL PROTECTED] xorp/cli/tools/send_cli_processor_xrl
+xorp/contrib/
+xorp/contrib/olsr/
+xorp/contrib/olsr/tools/
[EMAIL PROTECTED] xorp/contrib/olsr/tools/clear_database
[EMAIL PROTECTED] xorp/contrib/olsr/tools/print_databases
[EMAIL PROTECTED] xorp/contrib/olsr/xorp_olsr4
xorp/etc/
xorp/etc/templates/
xorp/etc/templates/bgp.cmds
@@ -21,6 +27,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 +39,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 +56,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 +64,48 @@ 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
[EMAIL PROTECTED] xorp/fea/tools/show_interfaces
[EMAIL PROTECTED] xorp/fea/xorp_fea
xorp/fea/xorp_fea_click_config_generator
-xorp/fea/xorp_fea_dummy
[EMAIL PROTECTED] xorp/fea/xorp_fea_dummy
xorp/fib2mrib/
-xorp/fib2mrib/xorp_fib2mrib
[EMAIL PROTECTED] xorp/fib2mrib/xorp_fib2mrib
xorp/libxipc/
-xorp/libxipc/xorp_finder
[EMAIL PROTECTED] xorp/libxipc/xorp_finder
xorp/mld6igmp/
-xorp/mld6igmp/xorp_igmp
-xorp/mld6igmp/xorp_mld
[EMAIL PROTECTED] xorp/mld6igmp/xorp_igmp
[EMAIL PROTECTED] 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
[EMAIL PROTECTED] xorp/ospf/tools/clear_database
[EMAIL PROTECTED] xorp/ospf/tools/print_lsas
[EMAIL PROTECTED] xorp/ospf/tools/print_neighbours
[EMAIL PROTECTED] xorp/ospf/xorp_ospfv2
[EMAIL PROTECTED] xorp/ospf/xorp_ospfv3
xorp/pim/
-xorp/pim/xorp_pimsm4
-xorp/pim/xorp_pimsm6
[EMAIL PROTECTED] xorp/pim/xorp_pimsm4
[EMAIL PROTECTED] xorp/pim/xorp_pimsm6
xorp/policy/
-xorp/policy/xorp_policy
[EMAIL PROTECTED] xorp/policy/xorp_policy
xorp/rib/
xorp/rib/tools/
-xorp/rib/tools/show_routes
-xorp/rib/xorp_rib
[EMAIL PROTECTED] xorp/rib/tools/show_distances
[EMAIL PROTECTED] xorp/rib/tools/show_routes
[EMAIL PROTECTED] 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
[EMAIL PROTECTED] xorp/rip/tools/show_peer_stats
[EMAIL PROTECTED] xorp/rip/tools/show_stats
[EMAIL PROTECTED] xorp/rip/xorp_rip
[EMAIL PROTECTED] xorp/rip/xorp_ripng
xorp/static_routes/
-xorp/static_routes/xorp_static_routes
[EMAIL PROTECTED] xorp/static_routes/xorp_static_routes
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 +113,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,11 +124,12 @@ 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
